bug修改

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

@@ -156,7 +156,7 @@ public class DeptAssessmentDeclarationController {
 	public R getDepartmentLeader(@PathVariable String id) {
 		QueryWrapper<EvaluationDept> qw = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(id)) {
-			qw.lambda().like(EvaluationDept::getDeptId, id);
+			qw.lambda().like(EvaluationDept::getDeptId, id).eq(EvaluationDept::getDelFlag,"1");
 		}
 		EvaluationDept evaluationDept = evaluationDeptService.getOne(qw);
 		return R.ok().data(evaluationDept);

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

@@ -126,7 +126,7 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 		List<DeptAssessmentDeclarationContent> deptAssessmentDeclarationContentList = new ArrayList<>();
 		QueryWrapper<EvaluationDept> deptQw = new QueryWrapper<>();
 		if (StringUtils.isNotEmpty(deptAssessmentDeclaration.getDeptId())) {
-			deptQw.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId());
+			deptQw.lambda().eq(EvaluationDept::getDeptId, deptAssessmentDeclaration.getDeptId()).eq(EvaluationDept::getDelFlag,"1");
 		}
 		EvaluationDept evaluationDept = evaluationDeptService.getOne(deptQw);
 		if (null != evaluationDept) {

ims-service/ims-eval/src/main/resources/mappers/DeptAssessmentDeclarationMapper.xml

@@ -65,7 +65,7 @@
 
     <select id="selectListPage" resultType="com.ims.eval.entity.DeptAssessmentDeclaration">
         select dad.* from dept_assessment_declaration dad
-        left join evaluation_dept ed on ed.dept_id = dad.dept_id
+        left join evaluation_dept ed on ed.dept_id = dad.dept_id and ed.dept_name=dad.dept_name
         <where>
             <if test="deptId != null and deptId != ''">
                 AND dad.dept_id = #{deptId}