考评周期、考评等级

operation_manager/src/main/java/com/huaxu/evaluation/controller/EvaluationItemController.java

@@ -46,9 +46,7 @@ public class EvaluationItemController{
         IPage<EvaluationItemEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationItemEntity entity = new EvaluationItemEntity();
         entity.setName(name);
-        if (companyOrgId != null)
-            entity.setCompanyOrgId(companyOrgId.intValue());
-        if(deptOrgId!=null)
+        if (deptOrgId != null)
             entity.setDeptOrgId(deptOrgId.intValue());
         iPage = evaluationItemService.findPage(iPage, entity);
         Pagination<EvaluationItemEntity> pages = new Pagination<>(iPage);

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationItemServiceImpl.java

@@ -53,6 +53,15 @@ public class EvaluationItemServiceImpl extends ServiceImpl<EvaluationItemMapper,
             //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
             evaluationItemEntity.setPermissonType(currentUser.getPermissonType());
         }
+        if(evaluationItemEntity.getDeptOrgId()!=null) {
+            Integer tempCompanyId = orgInfoUtil.getOrgCompanyId(evaluationItemEntity.getDeptOrgId());
+            if (tempCompanyId != null) {
+                evaluationItemEntity.setCompanyOrgId(tempCompanyId);
+            } else {
+                evaluationItemEntity.setCompanyOrgId(evaluationItemEntity.getDeptOrgId());
+                evaluationItemEntity.setDeptOrgId(null);
+            }
+        }
         Page<EvaluationItemEntity> iPage = evaluationItemMapper.findPage(page, evaluationItemEntity);
         for (EvaluationItemEntity item : iPage.getRecords()) {
             item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemMapper.xml

@@ -86,7 +86,7 @@
             </if>
 
             <if test="evaluationItem.companyOrgId!=null and evaluationItem.deptOrgId == null">
-                and a.DEPT_ORG_ID is null and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId}
+               and a.COMPANY_ORG_ID = #{evaluationItem.companyOrgId}
             </if>
             <if test="evaluationItem.name != null  and evaluationItem.name != ''">
                 and a.name LIKE concat('%',#{evaluationItem.name},'%')