考评周期、考评等级

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

@@ -48,9 +48,9 @@ public class EvaluationCycleController {
             @RequestParam(required = false) Long companyOrgId) {
         IPage<EvaluationCycleEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationCycleEntity entity = new EvaluationCycleEntity();
-        if (type != null)
+        if (type != null && type.trim() != "")
             entity.setType(Integer.valueOf(type));
-        if(companyOrgId!=null)
+        if (companyOrgId != null)
             entity.setCompanyOrgId(companyOrgId.intValue());
         iPage = evaluationCycleService.findPage(iPage, entity);
         Pagination<EvaluationCycleEntity> pages = new Pagination<>(iPage);

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

@@ -52,8 +52,10 @@ public class EvaluationGradeServiceImpl extends ServiceImpl<EvaluationGradeMappe
         Page<EvaluationGradeEntity> iPage = evaluationGradeMapper.findPage(page, evaluationGradeEntity);
         for (EvaluationGradeEntity item : iPage.getRecords()) {
             item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
-            item.setTypeName(dictUtil.getDictName("SC_EVALUATION_GRADE_TYPE",item.getType().intValue()));
-            item.setEvaluationGradeName(dictUtil.getDictName("SC_EVALUATION_GRADE",item.getEvaluationGrade().intValue()));
+            if (item.getType() != null)
+                item.setTypeName(dictUtil.getDictName("SC_EVALUATION_GRADE_TYPE", item.getType().intValue()));
+            if (item.getEvaluationGrade() != null)
+                item.setEvaluationGradeName(dictUtil.getDictName("SC_EVALUATION_GRADE", item.getEvaluationGrade().intValue()));
         }
         return iPage;
     }