Bladeren bron

用户详情增加集团部门信息

lixing 4 jaren geleden
bovenliggende
commit
e4f0e19bc7

+ 3 - 34
fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonItemVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.persagy.fm.common.model.vo.SimpleObjVO;
+import com.persagy.fm.department.model.Department;
 import com.persagy.fm.department.model.vo.DepSimpleObjVO;
 import com.persagy.fm.saas.project.model.vo.ProjectVO;
 import io.swagger.annotations.ApiModel;
@@ -136,39 +137,7 @@ public class ResponsePersonItemVO {
     @ApiModelProperty("启用状态")
     private String enableState;
 
-    public SimpleObjVO getPersonTypeVO() {
-        return personTypeVO == null ? new SimpleObjVO() : personTypeVO;
-    }
+    @ApiModelProperty("集团部门")
+    private Department groupDep;
 
-    public SimpleObjVO getCertificateTypeVO() {
-        return certificateTypeVO == null ? new SimpleObjVO() : certificateTypeVO;
-    }
-
-    public List<DepSimpleObjVO> getDeps() {
-        return deps == null ? Lists.newArrayList() : deps;
-    }
-
-    public List<ProjectVO> getProjects() {
-        return projects == null ? Lists.newArrayList() : projects;
-    }
-
-    public SimpleObjVO getMainDuty() {
-        return mainDuty == null ? new SimpleObjVO() : mainDuty;
-    }
-
-    public List<SimpleObjVO> getOtherDuties() {
-        return otherDuties == null ? Lists.newArrayList() : otherDuties;
-    }
-
-    public SimpleObjVO getLeaderVO() {
-        return leaderVO == null ? new SimpleObjVO() : leaderVO;
-    }
-
-    public List<SimpleObjVO> getProfessions() {
-        return professions == null ? Lists.newArrayList() : professions;
-    }
-
-    public List<SimpleObjVO> getOtherRoles() {
-        return otherRoles == null ? Lists.newArrayList() : otherRoles;
-    }
 }

+ 3 - 0
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonQueryServiceImpl.java

@@ -396,6 +396,9 @@ public class PersonQueryServiceImpl extends ServiceImpl<PersonMapper, Person>
             }
         }
 
+        // 设置员工的集团部门
+        responsePersonItemVO.setGroupDep(departmentService.getGroupDep());
+
         return responsePersonItemVO;
     }