修复上报判断条件

app/controller/change_controller.js

@@ -816,7 +816,7 @@ module.exports = app => {
                     throw '该变更令当前无法上报';
                 }
                 // 判断是否是修订，判断有无审批人员作弊
-                if (ctx.change.status === audit.flow.status.revise && ctx.tender.info.shenpi.change === shenpiConst.sp_status.sqspr) {
+                if ((ctx.change.status === audit.flow.status.revise || ctx.change.is_revise) && ctx.tender.info.shenpi.change === shenpiConst.sp_status.sqspr) {
                     // 获取上一次的审批人流程
                     const lastUserList = await ctx.service.changeAudit.getListGroupByTimes(ctx.change.cid, ctx.change.times - 1);
                     const lastUidList = ctx.helper._.map(lastUserList, 'uid');
@@ -826,10 +826,11 @@ module.exports = app => {
                     // 1.有原报，有其他人   可以添加原报作为审核人，但是不能只原报上报
                     // 2.有原报，无其他人   可以添加原报作为审核人，可以只原报上报
                     // 3.无原报，有其他人   不可以添加原报
-                    if (!ctx.helper._.isEqual(lastUidList, nowUidList) && ctx.helper._.includes(ctx.helper._.tail(lastUidList), lastUidList[0]) && nowUidList.length === 2 && nowUidList[0] === nowUidList[1]) {
+                    const noYBUidList = ctx.change.status === audit.flow.status.revise ? ctx.helper._.initial(ctx.helper._.tail(lastUidList)) : ctx.helper._.tail(lastUidList);
+                    if (!ctx.helper._.isEqual(lastUidList, nowUidList) && ctx.helper._.includes(noYBUidList, lastUidList[0]) && nowUidList.length === 2 && nowUidList[0] === nowUidList[1]) {
                         throw '该变更令不能指定原报人为单独审批人';
                     }
-                    if (!ctx.helper._.includes(ctx.helper._.tail(lastUidList), lastUidList[0]) && ctx.helper._.includes(ctx.helper._.tail(nowUidList), nowUidList[0])) {
+                    if (!ctx.helper._.includes(noYBUidList, lastUidList[0]) && ctx.helper._.includes(ctx.helper._.tail(nowUidList), nowUidList[0])) {
                         throw '该变更令不能指定原报为审批人,请移除';
                     }
                 }

app/service/change.js

@@ -1273,7 +1273,7 @@ module.exports = app => {
                 // 申请变更金额更新为上一次审批审批变更后数量,清空audit_amount值
                 const updateTpList = [];
                 for (const cl of changeList) {
-                    updateTpList.push({ id: cl.id, camount: cl.spamount, audit_amount: null });
+                    updateTpList.push({ id: cl.id, camount: cl.spamount, audit_amount: null, samount: '' });
                 }
                 if (updateTpList.length > 0) {
                     await this.transaction.updateRows(this.ctx.service.changeAuditList.tableName, updateTpList);