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

2024-01-23 14:41:02 +08:00
parent bd53579da3 2205f5d3ae
commit adc16485f9
7 changed files with 14 additions and 5 deletions
@@ -595,6 +595,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
                    term1.setAssessResults(assessResults);
                    if(StringUtils.isBlank(designEngineer1)){
                        designEngineer1 = termUser.getModuleOwner();
+                        updateTermUser.setDescription(termUser.getNotInvolved());
                    }
                    if(StringUtils.isBlank(designEngineer1)){
                        designEngineer1 = termUser.getResponsibleUnitLeader();
@@ -266,7 +266,7 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
                .collect(Collectors.toList());
        String loginUserId = CurrentUserUtil.getId();
        if (!canUrgingUserList.contains(loginUserId)){
-            throw new JeroBootException(ResultCommon.HORIZONTAL_TRANSGRESSION);
+            throw new JeroBootException(ResultCommon.TASK_URGING_ERROR_2);
        }

        //获得流程总表，发送消息