code review

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

@@ -49,10 +49,12 @@ public class EvaluationCycleController {
             @RequestParam(required = false) Long companyOrgId) {
         IPage<EvaluationCycleEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationCycleEntity entity = new EvaluationCycleEntity();
-        if (type != null && type.trim() != "")
+        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);
         return new AjaxMessage<>(ResultStatus.OK, pages);

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

@@ -49,10 +49,12 @@ public class EvaluationGradeController {
             ) {
         IPage<EvaluationGradeEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationGradeEntity entity = new EvaluationGradeEntity();
-        if (grade != null && grade.trim() != "")
+        if (grade != null && grade.trim() != "") {
             entity.setEvaluationGrade(Long.valueOf(grade));
-        if (companyOrgId != null)
+        }
+        if (companyOrgId != null) {
             entity.setCompanyOrgId(companyOrgId.intValue());
+        }
         iPage = evaluationGradeService.findPage(iPage, entity);
         Pagination<EvaluationGradeEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

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

@@ -45,8 +45,9 @@ public class EvaluationItemController{
         IPage<EvaluationItemEntity> iPage = new Page<>(pageNum, pageSize);
         EvaluationItemEntity entity = new EvaluationItemEntity();
         entity.setName(name);
-        if (deptOrgId != null)
+        if (deptOrgId != null) {
             entity.setDeptOrgId(deptOrgId.intValue());
+        }
         iPage = evaluationItemService.findPage(iPage, entity);
         Pagination<EvaluationItemEntity> pages = new Pagination<>(iPage);
         return new AjaxMessage<>(ResultStatus.OK, pages);

operation_manager/src/main/java/com/huaxu/org/OrgInfoUtil.java

@@ -63,7 +63,7 @@ public class OrgInfoUtil {
         Org org = userCenterClient.selectOne(id).getData();
         Org parentOrg = new Org();
         BeanUtils.copyProperties(org,parentOrg);
-        while (parentOrg.getOrgType().equals("department")) {
+        while ("department".equals(parentOrg.getOrgType())) {
             if (parentOrg.getParentOrgId().equals(0)|| parentOrg.getParentOrgId()==null) {
                 break;
             }
@@ -71,7 +71,7 @@ public class OrgInfoUtil {
             parentOrg.setOrgType(temp.getOrgType());
             parentOrg.setId(temp.getId());
             parentOrg.setParentOrgId(temp.getParentOrgId());
-            if (temp.getOrgType().equals("company")) {
+            if ("company".equals(temp.getOrgType())) {
                 parentId = temp.getId();
             }
         }