Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/base/base_tree_service.js

@@ -674,6 +674,8 @@ class TreeService extends Service {
             }
             // 选中节点--全部后节点 order--
             await this._updateChildrenOrder(mid, first[this.setting.pid], first[this.setting.order] + count, -count);
+            // 删除部位明细
+            await this._deleteRelaData(mid, deleteData);
             await this.transaction.commit();
             this.transaction = null;
 

app/service/stage_audit.js

@@ -1293,6 +1293,9 @@ module.exports = app => {
                 await this.ctx.service.stageSafeProd.updateHistory4TimesOrder(stage, stage.times, [selfAuditor.order + 1], transaction);
                 await this.ctx.service.stageTempLand.updateHistory4TimesOrder(stage, stage.times, [selfAuditor.order + 1], transaction);
 
+                // 多人协同，取消下一审批人存在的锁定
+                await this.ctx.service.stageAuditAss.lockConfirm4CheckNoPre(this.ctx.stage, stage.curAuditors.map(x => { return x.aid; }), stage.preAuditors.map(x => { return x.aid; }), transaction);
+
                 // 更新标段计量数据缓存
                 await this.ctx.service.tenderCache.updateStageCache4Flow(transaction, stage, stage.status, checkingAuditors, checkCancelAuditors, ledgerTp, stageTp);
                 // 上报/审批 - 检查三方特殊推送

app/service/stage_audit_ass.js

@@ -44,7 +44,7 @@ module.exports = app => {
             // 找出待上报或待审批的协同字段
             let accountStageAssData = [];
             if (spid) {
-                const sql = 'SELECT * FROM ?? AS a LEFT JOIN ?? AS t ON a.`tid` = t.`id` WHERE t.`spid` = "' + spid + '" AND a.`ass_user_id` = ?';
+                const sql = 'SELECT a.* FROM ?? AS a LEFT JOIN ?? AS t ON a.`tid` = t.`id` WHERE t.`spid` = "' + spid + '" AND a.`ass_user_id` = ?';
                 const params = [this.tableName, this.ctx.service.tender.tableName, ass_user_id];
                 accountStageAssData = await this.db.query(sql, params);
             } else {
@@ -70,7 +70,7 @@ module.exports = app => {
             const result = [];
             let accountAssData = [];
             if (spid) {
-                const sql = 'SELECT * FROM ?? AS a LEFT JOIN ?? AS t ON a.`tid` = t.`id` WHERE t.`spid` = "' + spid + '" AND a.`ass_user_id` = ?';
+                const sql = 'SELECT a.* FROM ?? AS a LEFT JOIN ?? AS t ON a.`tid` = t.`id` WHERE t.`spid` = "' + spid + '" AND a.`ass_user_id` = ?';
                 const params = [this.ctx.service.auditAss.tableName, this.ctx.service.tender.tableName, ass_user_id];
                 accountAssData = await this.db.query(sql, params);
             } else {