优化提交

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

@@ -70,7 +70,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		JSONArray array = JSONUtil.parseArray(jsonArr1.get("records"));
 		List<UserDTO> userList = JSONUtil.toList(array, UserDTO.class);
 		for (int i = 0; i < userList.size(); i++) {
-			if (!"".equals(userList.get(i).getNo()) || null != userList.get(i).getNo()) {
+			if (StringUtils.isNotEmpty(userList.get(i).getNo())) {
 				DeptAssessmentDeclarationContent deptAssessmentDeclarationContent = new DeptAssessmentDeclarationContent();
 				deptAssessmentDeclarationContent.setAssessmentDeclarationId(id);
 				deptAssessmentDeclarationContent.setSerialNumber(i + 1);

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

@@ -401,7 +401,8 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 		data.put("editFlag",editFlag);
 
 
-		//获取用户信息
+
+		//获取用户信息 23031009
 		boolean deptFlag = false;
 		MyuserResDTO user = userService.getSysUser(request);
 		if(null != user){
@@ -438,6 +439,9 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 					if (!d.getIsShow()) {
 						continue;
 					}
+					if(!deptFlag && d.getOptionCode().contains("DF")){
+						continue;
+					}
 					titlemap.put("key", d.getOptionName());//名称
 					titlemap.put("code",d.getChildCode()+"_"+d.getOptionCode());//名称
 					titlemap.put("flag", d.getIsQuantified());//是否量化