Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -384,7 +384,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             updPre.setRepairStartTime(LocalDateTime.now());
             updPre.setRepairUserId(model.getRepairUserId());
             updPre.setExecuteDept(model.getExecuteDept());
-            queryDTO.setUserId(preparation.getUserId());
+            queryDTO.setUserId(model.getRepairUserId());
         } else if (model.getVerifyStatus() == 3) { // 回退
             queryDTO.setUserId(getNotifyUserId(model,updPre,preparation));
             /*updPre.setStatus(PreparationStatusEnum.RECEIVE_VERIFY_BACK.getValue());
@@ -770,8 +770,10 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 部门负责人回退
                 updPre.setStatus(PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue());
                 // 审批主管变更
-                if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
-                    throw new DeniedException("部门主管审批通过，不可以修改审批主管人选");
+                if(!StringUtils.isEmpty(preparation.getApplyVerifyUserId())){
+                    if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
+                        throw new DeniedException("部门主管审批通过，不可以修改审批主管人选");
+                    }
                 }
                 // 收件部门变更
                 if(!updPre.getReceiveDept().equals(preparation.getReceiveDept())){
@@ -791,8 +793,10 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 // 收件部门回退
                 updPre.setStatus(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
                 // 审批主管变更
-                if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
-                    throw new DeniedException("单据已流转到收件部门，不可以修改审批主管人选");
+                if(!StringUtils.isEmpty(preparation.getApplyVerifyUserId())){
+                    if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
+                        throw new DeniedException("单据已流转到收件部门，不可以修改审批主管人选");
+                    }
                 }
                 // 收件部门变更
                 if(!updPre.getReceiveDept().equals(preparation.getReceiveDept())){
@@ -811,9 +815,10 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             case CommonConstants.FIRST_PROCESSING_VERIFY_BACK:
                 // 申请费用回退
                 updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
-                // 审批主管变更
-                if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
-                    throw new DeniedException("单据已流转到费用审核流程，不可以修改审批主管人选");
+                if(!StringUtils.isEmpty(preparation.getApplyVerifyUserId())){
+                    if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
+                        throw new DeniedException("单据已流转到费用审核流程，不可以修改审批主管人选");
+                    }
                 }
                 // 收件部门变更
                 if(!updPre.getReceiveDept().equals(preparation.getReceiveDept())){
@@ -825,9 +830,11 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
             case CommonConstants.SECOND_PROCESSING_BACK:
                 // 验收回退
                 updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
-                // 审批主管变更
-                if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
-                    throw new DeniedException("单据已流转到验收审核流程，不可以修改审批主管人选");
+                if(!StringUtils.isEmpty(preparation.getApplyVerifyUserId())){
+                    // 审批主管变更
+                    if(!updPre.getApplyVerifyUserId().equals(preparation.getApplyVerifyUserId())){
+                        throw new DeniedException("单据已流转到验收审核流程，不可以修改审批主管人选");
+                    }
                 }
                 // 收件部门变更
                 if(!updPre.getReceiveDept().equals(preparation.getReceiveDept())){