代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/component/NextApproverImpl.java

@@ -26,14 +26,15 @@ public class NextApproverImpl {
 	 * @return 结果
 	 */
 	public List<SysUser> submitTask1(String a1, String a2, String a3) {
-		System.out.println("进入方法submitTask1----------------->" + "a1：" + a1 + "-----------a2：" + a2 + "-----------a3：" + a3);
-		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(a1);
 		List<SysUser> userList = new ArrayList<>();
-		SysUser user = new SysUser();
-		user.setId(deptAssessmentDeclaration.getDeptLeaderId());
-		user.setNo(deptAssessmentDeclaration.getDeptLeaderNo());
-		user.setName(deptAssessmentDeclaration.getDeptLeaderName());
-		userList.add(user);
+		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(a1);
+		if (null != deptAssessmentDeclaration){
+			SysUser user = new SysUser();
+			user.setId(deptAssessmentDeclaration.getDeptLeaderId());
+			user.setNo(deptAssessmentDeclaration.getDeptLeaderNo());
+			user.setName(deptAssessmentDeclaration.getDeptLeaderName());
+			userList.add(user);
+		}
 		return userList;
 	}
 
@@ -43,14 +44,15 @@ public class NextApproverImpl {
 	 * @return 结果
 	 */
 	public List<SysUser> submitTask2(String a1, String a2, String a3) {
-		System.out.println("进入方法submitTask1----------------->" + "a1：" + a1 + "-----------a2：" + a2 + "-----------a3：" + a3);
-		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(a1);
 		List<SysUser> userList = new ArrayList<>();
-		SysUser user = new SysUser();
-		user.setId(deptAssessmentDeclaration.getSeconderId());
-		user.setNo(deptAssessmentDeclaration.getSeconderNo());
-		user.setName(deptAssessmentDeclaration.getSeconderName());
-		userList.add(user);
+		DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(a1);
+		if (null != deptAssessmentDeclaration){
+			SysUser user = new SysUser();
+			user.setId(deptAssessmentDeclaration.getSeconderId());
+			user.setNo(deptAssessmentDeclaration.getSeconderNo());
+			user.setName(deptAssessmentDeclaration.getSeconderName());
+			userList.add(user);
+		}
 		return userList;
 	}
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptAssessmentDeclarationServiceImpl.java

@@ -183,7 +183,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		if (StringUtils.isNotEmpty(instId)) {
 			deptAssessmentDeclaration.setInstId(instId);
 		}
-		super.saveOrUpdate(deptAssessmentDeclaration);
+		super.updateById(deptAssessmentDeclaration);
 		if ("流程已结束".equals(deptAssessmentDeclaration.getStage())) {
 			QueryWrapper<EvaluationDeptRating> qw = new QueryWrapper<>();
 			if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {