代码优化

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -652,10 +652,12 @@ public class DeptAssessmentDeclarationController {
 		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 		if (userList.size() > 0) {
 			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
-			deptAssessmentDeclaration.setDeptLeaderId(userList.get(0).getId());
-			deptAssessmentDeclaration.setDeptLeaderNo(userList.get(0).getNo());
-			deptAssessmentDeclaration.setDeptLeaderName(userList.get(0).getName());
-			b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
+			if (null != deptAssessmentDeclaration) {
+				deptAssessmentDeclaration.setDeptLeaderId(userList.get(0).getId());
+				deptAssessmentDeclaration.setDeptLeaderNo(userList.get(0).getNo());
+				deptAssessmentDeclaration.setDeptLeaderName(userList.get(0).getName());
+				b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
+			}
 		}
 		if (b) {
 			return R.ok().data(b);
@@ -681,10 +683,12 @@ public class DeptAssessmentDeclarationController {
 		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 		if (userList.size() > 0) {
 			DeptAssessmentDeclaration deptAssessmentDeclaration = deptAssessmentDeclarationService.getById(id);
-			deptAssessmentDeclaration.setSeconderId(userList.get(0).getId());
-			deptAssessmentDeclaration.setSeconderNo(userList.get(0).getNo());
-			deptAssessmentDeclaration.setSeconderName(userList.get(0).getName());
-			b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
+			if (null != deptAssessmentDeclaration) {
+				deptAssessmentDeclaration.setSeconderId(userList.get(0).getId());
+				deptAssessmentDeclaration.setSeconderNo(userList.get(0).getNo());
+				deptAssessmentDeclaration.setSeconderName(userList.get(0).getName());
+				b = deptAssessmentDeclarationService.updateById(deptAssessmentDeclaration);
+			}
 		}
 		if (b) {
 			return R.ok().data(b);