Merge remote-tracking branch 'origin/master'

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

@@ -165,6 +165,17 @@ public class DepartmentalPerformanceIndicatorPlanController {
 	@GetMapping(value = "/details/{id}/{deptId}")
 	public R details(@PathVariable("id") String id, @PathVariable("deptId") String deptId) {
 		List<EvaluationDeptBusinessContent> list = evaluationDeptBusinessContentService.detailsList(id, deptId);
+		for (EvaluationDeptBusinessContent evaluationDeptBusinessContent : list) {
+			if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
+				evaluationDeptBusinessContent.setDataPermission("1");
+			} else {
+				if ("23031009".equals(deptId)) {//组织人事部
+					evaluationDeptBusinessContent.setDataPermission("1");
+				} else {
+					evaluationDeptBusinessContent.setDataPermission("-1");
+				}
+			}
+		}
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/entity/EvaluationDeptBusinessContent.java

@@ -119,8 +119,8 @@ public class EvaluationDeptBusinessContent extends Model {
 	private String remark;
 
 	/**
-	 * 当前用户部门
+	 * 数据权限(-1置灰 1正常)
 	 */
 	@TableField(exist = false)
-	private String currentUserDept;
+	private String dataPermission;
 }

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

@@ -67,65 +67,32 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 				}
 			} else {//修改
 				evaluationDeptBusinessContent.setCreateDept(null);
-				if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
-					QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
-					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
-						qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
-					}
+				QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
+				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
+					qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
+				}
+				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
+					qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+				}
+				if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
+					qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
+				}
+				List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
+				if (objList2.size() == 1) {
+					list2.add(evaluationDeptBusinessContent);
+				} else if (objList2.size() == 0) {
+					QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
 					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-						qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
+						qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
 					}
 					if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
 						qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
 					}
-					List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
-					if (objList2.size() == 1) {
+					List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
+					if (objList3.size() == 0) {
 						list2.add(evaluationDeptBusinessContent);
-					} else if (objList2.size() == 0) {
-						QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
-						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-							qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-						}
-						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-							qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-						}
-						List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
-						if (objList3.size() == 0) {
-							list2.add(evaluationDeptBusinessContent);
-						} else {
-							b = false;
-						}
-					}
-				} else {
-					if ("23031009".equals(evaluationDeptBusinessContent.getCurrentUserDept())) {//组织人事部
-						QueryWrapper<EvaluationDeptBusinessContent> qw = new QueryWrapper<>();
-						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getId())) {
-							qw.lambda().like(EvaluationDeptBusinessContent::getId, evaluationDeptBusinessContent.getId());
-						}
-						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-							qw.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-						}
-						if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-							qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-						}
-						List<EvaluationDeptBusinessContent> objList2 = super.list(qw);
-						if (objList2.size() == 1) {
-							list2.add(evaluationDeptBusinessContent);
-						} else if (objList2.size() == 0) {
-							QueryWrapper<EvaluationDeptBusinessContent> qw1 = new QueryWrapper<>();
-							if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getBusinessPlanId())) {
-								qw1.lambda().like(EvaluationDeptBusinessContent::getBusinessPlanId, evaluationDeptBusinessContent.getBusinessPlanId());
-							}
-							if (StringUtils.isNotEmpty(evaluationDeptBusinessContent.getTargetName())) {
-								qw.lambda().like(EvaluationDeptBusinessContent::getTargetName, evaluationDeptBusinessContent.getTargetName());
-							}
-							List<EvaluationDeptBusinessContent> objList3 = super.list(qw1);
-							if (objList3.size() == 0) {
-								list2.add(evaluationDeptBusinessContent);
-							} else {
-								b = false;
-							}
-						}
+					} else {
+						b = false;
 					}
 				}
 			}
@@ -170,17 +137,9 @@ public class EvaluationDeptBusinessContentServiceImpl extends ServiceImpl<Evalua
 			}
 			List<EvaluationDeptBusinessContent> objList = super.list(qw);
 			if (objList.size() == 1) {//修改
-				if (!"23031009".equals(evaluationDeptBusinessContent.getCreateDept())) {//是否组织人事部添加的数据
-					evaluationDeptBusinessContent.setId(objList.get(0).getId());
-					evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
-					b = super.updateById(evaluationDeptBusinessContent);
-				}else {
-					if ("23031009".equals(evaluationDeptBusinessContent.getCurrentUserDept())) {//组织人事部
-						evaluationDeptBusinessContent.setId(objList.get(0).getId());
-						evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
-						b = super.updateById(evaluationDeptBusinessContent);
-					}
-				}
+				evaluationDeptBusinessContent.setId(objList.get(0).getId());
+				evaluationDeptBusinessContent.setUpdateTime(DateUtil.date());
+				b = super.updateById(evaluationDeptBusinessContent);
 			} else if (objList.size() == 0) {//新增
 				List<OrganizationStructure> organizationStructureList = organizationStructureService.getTree("23031001", 1, "140");
 				OrganizationStructure organizationStructure = organizationStructureList.get(0).getChildren().stream().filter(item -> item.getId().equals(evaluationDeptBusinessContent.getDeptId())).findFirst().orElse(null);