考评项设置

operation_manager/src/main/java/com/huaxu/evaluation/entity/EvaluationItemValueEntity.java

@@ -11,6 +11,7 @@ import com.huaxu.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 /**
  * sc_evaluation_item_value
@@ -27,6 +28,14 @@ public class EvaluationItemValueEntity extends BaseEntity {
     @ApiModelProperty(value = "名称")
     private Long evaluationItemId;
 
+    @ApiModelProperty(value = "所属公司ID")
+    @TableField(exist = false)
+    private Integer companyOrgId;
+
+    @ApiModelProperty(value = "所属部门ID")
+    @TableField(exist = false)
+    private Integer deptOrgId;
+
     /** 类型(0大于等于 2小于 1介于) */
     @ApiModelProperty(value = "类型(0大于等于 2小于 1介于)")
     private Long type;

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

@@ -3,6 +3,8 @@ package com.huaxu.org;
 import com.huaxu.client.UserCenterClient;
 import com.huaxu.util.RedisUtil;
 import com.huaxu.util.UserUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -60,13 +62,15 @@ public class OrgInfoUtil {
         Integer parentId = null;
         Org org = userCenterClient.selectOne(id).getData();
         Org parentOrg = new Org();
-        parentOrg.setOrgType(org.getOrgType());
+        BeanUtils.copyProperties(org,parentOrg);
         while (parentOrg.getOrgType().equals("department")) {
-            if (org.getParentOrgId().equals(0)) {
+            if (parentOrg.getParentOrgId().equals(0)|| parentOrg.getParentOrgId()==null) {
                 break;
             }
-            Org temp = userCenterClient.selectOne(org.getParentOrgId()).getData();
+            Org temp = userCenterClient.selectOne(parentOrg.getParentOrgId()).getData();
             parentOrg.setOrgType(temp.getOrgType());
+            parentOrg.setId(temp.getId());
+            parentOrg.setParentOrgId(temp.getParentOrgId());
             if (temp.getOrgType().equals("company")) {
                 parentId = temp.getId();
             }