人员配置选人修改

sop-business/src/main/java/com/qmth/sop/business/activiti/service/impl/ActivitiServiceImpl.java

@@ -1070,8 +1070,8 @@ public class ActivitiServiceImpl implements ActivitiService {
                                 TFFlowLog tfFlowLog = tfFlowLogService.findByLastFlowLog(flowId,
                                         FlowApproveOperationEnum.APPROVE);
                                 if (tfFlowLog.getApproveId().longValue() == sysUser.getId().longValue()
-                                        && tfFlowLog.getApproveSetup().intValue() == 3 && Objects.equals(
-                                        tfFlowLog.getApproveRemark(), SystemConstant.SYSTEM_AUTO_APPROVE)) {
+                                        && tfFlowLog.getApproveSetup().intValue() == 3 && Objects.nonNull(
+                                        tfFlowLog.getApproveRemark())) {
                                     sopRoleTypeCompositeEnum = SopRoleTypeCompositeEnum.PROJECT_MANAGER;
                                 }
                             } else if (Objects.equals(