|
@@ -270,7 +270,6 @@ module.exports = class extends Base {
|
|
|
async getPersonListAction() {
|
|
|
const param = this.post();
|
|
|
const list = await this.model('delegate_leading').alias('le').join({table:'activity_leading',on:['id','leadingID'],join:'right',as:'al'}).where('al.activityID="' + param.activityID + '" and le.isLeading=' + param.isLeading).page(param.page, param.pageSize).countSelect();
|
|
|
- console.log(list);
|
|
|
this.success(list)
|
|
|
}
|
|
|
|
|
@@ -318,7 +317,6 @@ module.exports = class extends Base {
|
|
|
async editLeadingPersonAction() {
|
|
|
const param = this.post();
|
|
|
const editRes = await this.model('delegate_leading').where({id:param.leadingID}).update(param).catch((err) => {
|
|
|
- console.log(err);
|
|
|
return think.isError(err) ? err : new Error(err);
|
|
|
});
|
|
|
if (think.isError(editRes)) {
|
|
@@ -803,7 +801,6 @@ module.exports = class extends Base {
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
let count = await this.model('activity').setRelation(false).join('person on person.id = activity.mainPerson')
|
|
|
.join('matter on matter.activityID = activity.id').join('fw_task_act on fw_task_act.c_task = matter.taskid')
|
|
|
.where(where).distinct('activity.id').select();
|