Browse Source

调试人员接口

lixing 4 years ago
parent
commit
b1837addbe

+ 17 - 5
fm-person/src/main/java/com/persagy/fm/department/service/impl/DepartmentServiceImpl.java

@@ -9,6 +9,7 @@ import com.google.common.collect.Lists;
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.enums.ResponseCode;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.common.exception.BusinessException;
 import com.persagy.fm.common.constant.DefaultValueConstants;
 import com.persagy.fm.common.constant.DefaultValueConstants;
+import com.persagy.fm.common.constant.enums.BoolEnum;
 import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.persagy.fm.common.constant.enums.ValidEnum;
 import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.context.DefaultAppContext;
 import com.persagy.fm.common.model.dto.Sort;
 import com.persagy.fm.common.model.dto.Sort;
@@ -28,12 +29,16 @@ import com.persagy.fm.depproject.service.IDepProjectService;
 import com.persagy.fm.person.model.dto.PageQueryPersonDTO;
 import com.persagy.fm.person.model.dto.PageQueryPersonDTO;
 import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
 import com.persagy.fm.person.model.vo.ResponsePersonListItemVO;
 import com.persagy.fm.person.service.IPersonService;
 import com.persagy.fm.person.service.IPersonService;
+import com.persagy.fm.workresume.model.WorkResume;
+import com.persagy.fm.workresume.model.dto.QueryWorkResumeDTO;
+import com.persagy.fm.workresume.service.IWorkResumeService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
+import java.util.Collection;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -50,16 +55,13 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     private IDepProjectService depProjectService;
     private IDepProjectService depProjectService;
     @Autowired
     @Autowired
     private IPersonService personService;
     private IPersonService personService;
+    @Autowired
+    private IWorkResumeService workResumeService;
 
 
     @Override
     @Override
     @Transactional
     @Transactional
     public String createDepartment(AddDepartmentDTO addDepartmentDTO) {
     public String createDepartment(AddDepartmentDTO addDepartmentDTO) {
         Department department = saveDepartment(addDepartmentDTO);
         Department department = saveDepartment(addDepartmentDTO);
-
-        // 将人员的工作信息标记为主管
-        List<String> managers = addDepartmentDTO.getManagers();
-
-
         // 保存部门和项目的关系
         // 保存部门和项目的关系
         List<String> projectIds = addDepartmentDTO.getProjectIds();
         List<String> projectIds = addDepartmentDTO.getProjectIds();
         String depId = department.getId();
         String depId = department.getId();
@@ -202,6 +204,16 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         String depId = department.getId();
         String depId = department.getId();
         List<String> projectIds = updateDepartmentDTO.getProjectIds();
         List<String> projectIds = updateDepartmentDTO.getProjectIds();
         updateDepProject(projectIds, depId);
         updateDepProject(projectIds, depId);
+        // 将负责人的工作信息标记为主管
+        List<String> managers = updateDepartmentDTO.getManagers();
+        if (!CollectionUtils.isEmpty(managers)) {
+            QueryWorkResumeDTO queryWorkResumeDTO = new QueryWorkResumeDTO();
+            queryWorkResumeDTO.setPersonIds(managers);
+            queryWorkResumeDTO.setDepId(department.getId());
+            List<WorkResume> workResumes = workResumeService.queryWorkResumeList(queryWorkResumeDTO);
+            workResumes.forEach(workResume -> workResume.setIsLeader(BoolEnum.TRUE.getType()));
+            workResumeService.batchUpdateWorkResume(workResumes);
+        }
     }
     }
 
 
     @Override
     @Override

+ 1 - 1
fm-person/src/main/java/com/persagy/fm/person/model/Person.java

@@ -52,7 +52,7 @@ public class Person extends AuditableEntity<Person> implements Serializable {
     private String userFrom;
     private String userFrom;
 
 
     @ApiModelProperty("员工类型")
     @ApiModelProperty("员工类型")
-    private String type;
+    private String personType;
 
 
     @ApiModelProperty("备注")
     @ApiModelProperty("备注")
     private String remark;
     private String remark;

+ 3 - 2
fm-person/src/main/java/com/persagy/fm/person/model/dto/UpsertPersonDTO.java

@@ -37,7 +37,7 @@ public class UpsertPersonDTO {
     private Integer gender;
     private Integer gender;
 
 
     @ApiModelProperty(value = "员工类型")
     @ApiModelProperty(value = "员工类型")
-    private String type;
+    private String personType;
 
 
     @Pattern(regexp = RegexConstants.PHONE_REGEX, message = RegexConstants.PHONE_REGEX_WARNING)
     @Pattern(regexp = RegexConstants.PHONE_REGEX, message = RegexConstants.PHONE_REGEX_WARNING)
     @Length(max = 11, message = "手机号码长度不能大于11")
     @Length(max = 11, message = "手机号码长度不能大于11")
@@ -48,7 +48,7 @@ public class UpsertPersonDTO {
     private String certificateType;
     private String certificateType;
 
 
     @Pattern(regexp = RegexConstants.ID_CARD_REGEX, message = RegexConstants.ID_CARD_REGEX_WARNING)
     @Pattern(regexp = RegexConstants.ID_CARD_REGEX, message = RegexConstants.ID_CARD_REGEX_WARNING)
-    @Length(max = 11, message = "证件号码长度不能大于18")
+    @Length(max = 18, message = "证件号码长度不能大于18")
     @ApiModelProperty(value = "证件号码")
     @ApiModelProperty(value = "证件号码")
     private String idNumber;
     private String idNumber;
 
 
@@ -78,6 +78,7 @@ public class UpsertPersonDTO {
     private Long leader;
     private Long leader;
 
 
     @ApiModelProperty(value = "专业")
     @ApiModelProperty(value = "专业")
+    // TODO: 2021/4/2 修改为列表
     private String profession;
     private String profession;
 
 
     @ApiModelProperty(value = "附加权限")
     @ApiModelProperty(value = "附加权限")

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

@@ -39,10 +39,10 @@ public class ResponsePersonItemVO {
 
 
     @ApiModelProperty(value = "员工类型id")
     @ApiModelProperty(value = "员工类型id")
     @JsonIgnore
     @JsonIgnore
-    private String type;
+    private String personType;
 
 
     @ApiModelProperty("员工类型")
     @ApiModelProperty("员工类型")
-    private SimpleObjVO personType;
+    private SimpleObjVO personTypeVO;
 
 
     @ApiModelProperty(value = "手机号码")
     @ApiModelProperty(value = "手机号码")
     private String phoneNum;
     private String phoneNum;

+ 2 - 2
fm-person/src/main/java/com/persagy/fm/person/model/vo/ResponsePersonListItemVO.java

@@ -28,10 +28,10 @@ public class ResponsePersonListItemVO {
 
 
     @ApiModelProperty("员工类型编码")
     @ApiModelProperty("员工类型编码")
     @JsonIgnore
     @JsonIgnore
-    private String type;
+    private String personType;
 
 
     @ApiModelProperty("员工类型")
     @ApiModelProperty("员工类型")
-    private SimpleObjVO personType;
+    private SimpleObjVO personTypeVO;
 
 
     @ApiModelProperty("账号id")
     @ApiModelProperty("账号id")
     @JsonIgnore
     @JsonIgnore

+ 27 - 19
fm-person/src/main/java/com/persagy/fm/person/service/impl/PersonServiceImpl.java

@@ -166,12 +166,11 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
      * @version V1.0 2021/3/26 11:42 上午
      * @version V1.0 2021/3/26 11:42 上午
      */
      */
     private void saveAccountRole(String accountId, String roleId, String accountRoleType) {
     private void saveAccountRole(String accountId, String roleId, String accountRoleType) {
-        AddSaasAccountRoleDTO mainDutyDTO = new AddSaasAccountRoleDTO();
-        mainDutyDTO.setDefaultValue();
-        mainDutyDTO.setAccountId(accountId);
-        mainDutyDTO.setRoleId(roleId);
-        mainDutyDTO.setCasType(accountRoleType);
-        saasAccountRoleService.createSaasAccountRole(mainDutyDTO);
+        AddSaasAccountRoleDTO addAccountRoleDTO = new AddSaasAccountRoleDTO();
+        addAccountRoleDTO.setAccountId(accountId);
+        addAccountRoleDTO.setRoleId(roleId);
+        addAccountRoleDTO.setCasType(accountRoleType);
+        saasAccountRoleService.createSaasAccountRole(addAccountRoleDTO);
     }
     }
 
 
     /**
     /**
@@ -264,6 +263,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
     private void checkPhoneNum(String phoneNum) {
     private void checkPhoneNum(String phoneNum) {
         PageQuerySaasAccountDTO pageQuerySaasAccountDTO = new PageQuerySaasAccountDTO();
         PageQuerySaasAccountDTO pageQuerySaasAccountDTO = new PageQuerySaasAccountDTO();
         pageQuerySaasAccountDTO.setDefaultValue();
         pageQuerySaasAccountDTO.setDefaultValue();
+        pageQuerySaasAccountDTO.setAccountId(null);
         pageQuerySaasAccountDTO.setPhoneNum(phoneNum);
         pageQuerySaasAccountDTO.setPhoneNum(phoneNum);
         FmResponseContent<List<SaasAccountListItemVO>> listFmResponseContent = saasAccountClient.querySaasAccountPageList(pageQuerySaasAccountDTO);
         FmResponseContent<List<SaasAccountListItemVO>> listFmResponseContent = saasAccountClient.querySaasAccountPageList(pageQuerySaasAccountDTO);
         if (listFmResponseContent.getCount() > 0) {
         if (listFmResponseContent.getCount() > 0) {
@@ -389,6 +389,7 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         // TODO: 2021/4/1
         // TODO: 2021/4/1
         // 判断是否有账号相关的更新
         // 判断是否有账号相关的更新
         // 判断是否有工作信息相关的更新
         // 判断是否有工作信息相关的更新
+        List<String> depIds = updatePersonDTO.getDepIds();
         List<WorkResume> workResumes = workResumeService.queryWorkResumeListByPersonIdList(Lists.newArrayList(personId));
         List<WorkResume> workResumes = workResumeService.queryWorkResumeListByPersonIdList(Lists.newArrayList(personId));
 
 
     }
     }
@@ -457,15 +458,17 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
 
 
         for (ResponsePersonListItemVO responsePersonListItem : responsePersonListItems) {
         for (ResponsePersonListItemVO responsePersonListItem : responsePersonListItems) {
             // 设置人员主岗副岗信息
             // 设置人员主岗副岗信息
-            AccountRoleVO accountRoleVO = accountRoleVoMap.get(responsePersonListItem.getAccountId());
-            if (accountRoleVO != null) {
-                responsePersonListItem.setMainDuty(accountRoleVO.getMainDuty());
-                responsePersonListItem.setOtherDuties(accountRoleVO.getOtherDuties());
+            if (accountRoleVoMap != null) {
+                AccountRoleVO accountRoleVO = accountRoleVoMap.get(responsePersonListItem.getAccountId());
+                if (accountRoleVO != null) {
+                    responsePersonListItem.setMainDuty(accountRoleVO.getMainDuty());
+                    responsePersonListItem.setOtherDuties(accountRoleVO.getOtherDuties());
+                }
             }
             }
 
 
             // 设置员工类型
             // 设置员工类型
-            String type = responsePersonListItem.getType();
-            responsePersonListItem.setPersonType(getPersonTypeVO(type));
+            String type = responsePersonListItem.getPersonType();
+            responsePersonListItem.setPersonTypeVO(getPersonTypeVO(type));
 
 
             // 设置专业
             // 设置专业
             String profession = responsePersonListItem.getProfession();
             String profession = responsePersonListItem.getProfession();
@@ -586,16 +589,18 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
         String accountId = person.getAccountId();
         String accountId = person.getAccountId();
         Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.
         Map<String, AccountRoleVO> accountRoleVoMap = saasAccountRoleService.
                 queryAccountRoleVoMapByAccountIdList(Lists.newArrayList(accountId));
                 queryAccountRoleVoMapByAccountIdList(Lists.newArrayList(accountId));
-        AccountRoleVO accountRoleVO = accountRoleVoMap.get(accountId);
-        if (accountRoleVO != null) {
-            responsePersonItemVO.setMainDuty(accountRoleVO.getMainDuty());
-            responsePersonItemVO.setOtherDuties(accountRoleVO.getOtherDuties());
-            responsePersonItemVO.setOtherRoles(accountRoleVO.getOtherRoles());
+        if (accountRoleVoMap != null) {
+            AccountRoleVO accountRoleVO = accountRoleVoMap.get(accountId);
+            if (accountRoleVO != null) {
+                responsePersonItemVO.setMainDuty(accountRoleVO.getMainDuty());
+                responsePersonItemVO.setOtherDuties(accountRoleVO.getOtherDuties());
+                responsePersonItemVO.setOtherRoles(accountRoleVO.getOtherRoles());
+            }
         }
         }
 
 
         // 设置员工类型
         // 设置员工类型
-        String type = person.getType();
-        responsePersonItemVO.setPersonType(getPersonTypeVO(type));
+        String type = person.getPersonType();
+        responsePersonItemVO.setPersonTypeVO(getPersonTypeVO(type));
 
 
         // 设置专业
         // 设置专业
         String profession = person.getProfession();
         String profession = person.getProfession();
@@ -641,6 +646,9 @@ public class PersonServiceImpl extends ServiceImpl<PersonMapper, Person>
      * @version V1.0 2021/4/1 2:53 下午
      * @version V1.0 2021/4/1 2:53 下午
      */
      */
     private SimpleObjVO getLeaderVO(String leaderId) {
     private SimpleObjVO getLeaderVO(String leaderId) {
+        if (StringUtils.isBlank(leaderId)) {
+            return new SimpleObjVO();
+        }
         Person person = queryPersonProfile(leaderId);
         Person person = queryPersonProfile(leaderId);
         return new SimpleObjVO(leaderId, person.getName());
         return new SimpleObjVO(leaderId, person.getName());
     }
     }

+ 7 - 14
fm-person/src/main/java/com/persagy/fm/saas/accountrole/service/impl/SaasAccountRoleServiceImpl.java

@@ -14,6 +14,7 @@ import com.persagy.fm.saas.accountrole.model.vo.AccountRoleVO;
 import com.persagy.fm.saas.accountrole.service.ISaasAccountRoleService;
 import com.persagy.fm.saas.accountrole.service.ISaasAccountRoleService;
 import com.persagy.fm.saas.role.model.SaasRole;
 import com.persagy.fm.saas.role.model.SaasRole;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
+import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -48,25 +49,12 @@ public class SaasAccountRoleServiceImpl implements ISaasAccountRoleService {
      */
      */
     @Override
     @Override
     public String createSaasAccountRole(AddSaasAccountRoleDTO addSaasAccountRoleDTO) {
     public String createSaasAccountRole(AddSaasAccountRoleDTO addSaasAccountRoleDTO) {
-        setDefaultValue(addSaasAccountRoleDTO);
+        addSaasAccountRoleDTO.setDefaultValue();
         FmResponseContent<String> saasAccountRole = saasAccountRoleClient.createSaasAccountRole(addSaasAccountRoleDTO);
         FmResponseContent<String> saasAccountRole = saasAccountRoleClient.createSaasAccountRole(addSaasAccountRoleDTO);
         return saasAccountRole.getContent();
         return saasAccountRole.getContent();
     }
     }
 
 
     /**
     /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param addSaasAccountRoleDTO 创建账号-角色关联入参
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(AddSaasAccountRoleDTO addSaasAccountRoleDTO) {
-        addSaasAccountRoleDTO.setGroupCode(DefaultAppContext.getContext().getGroupCode());
-        addSaasAccountRoleDTO.setAppId(DefaultAppContext.getContext().getAppId());
-        addSaasAccountRoleDTO.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
-    }
-
-    /**
      * 删除账号-角色关联信息
      * 删除账号-角色关联信息
      *
      *
      * @param accountId 账号主键
      * @param accountId 账号主键
@@ -92,7 +80,12 @@ public class SaasAccountRoleServiceImpl implements ISaasAccountRoleService {
      */
      */
     @Override
     @Override
     public List<SaasAccountRole> querySaasAccountRoleList(QuerySaasAccountRoleDTO querySaasAccountRoleDTO) {
     public List<SaasAccountRole> querySaasAccountRoleList(QuerySaasAccountRoleDTO querySaasAccountRoleDTO) {
+        String accountId = querySaasAccountRoleDTO.getAccountId();
         querySaasAccountRoleDTO.setDefaultValue();
         querySaasAccountRoleDTO.setDefaultValue();
+        // 如果查询条件中不包含accountId, setDefaultValue() 会将accountId设置为当前登录人,这里需要重新置空
+        if (StringUtils.isEmpty(accountId)) {
+            querySaasAccountRoleDTO.setAccountId(null);
+        }
         FmResponseContent<List<SaasAccountRole>> responseContent = saasAccountRoleClient.querySaasAccountRoleList(querySaasAccountRoleDTO);
         FmResponseContent<List<SaasAccountRole>> responseContent = saasAccountRoleClient.querySaasAccountRoleList(querySaasAccountRoleDTO);
         return responseContent.getContent();
         return responseContent.getContent();
     }
     }

+ 8 - 4
fm-person/src/main/java/com/persagy/fm/saas/common/model/dto/SaasBaseDTO.java

@@ -1,8 +1,9 @@
 package com.persagy.fm.saas.common.model.dto;
 package com.persagy.fm.saas.common.model.dto;
 
 
-import com.persagy.fm.common.context.DefaultAppContext;
+import com.persagy.fm.common.context.AppContext;
 import com.persagy.fm.saas.account.constant.enums.AccountBelongEnum;
 import com.persagy.fm.saas.account.constant.enums.AccountBelongEnum;
 import lombok.Data;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 
 /**
 /**
  * 运维平台基础dto类
  * 运维平台基础dto类
@@ -25,8 +26,11 @@ public class SaasBaseDTO {
      */
      */
     public void setDefaultValue() {
     public void setDefaultValue() {
         this.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
         this.setAccountBelong(AccountBelongEnum.BUSINESS.getType());
-        this.setAccountId(DefaultAppContext.getContext().getAccountId());
-        this.setGroupCode(DefaultAppContext.getContext().getGroupCode());
-        this.setAppId(DefaultAppContext.getContext().getAppId());
+        // accountId是运维平台部分接口需要传入的参数(例如账号关联角色,账号关联项目),而非操作人。这里增加判断,只有为空时,才赋值;
+        if (StringUtils.isEmpty(this.getAccountId())) {
+            this.setAccountId(AppContext.getContext().getAccountId());
+        }
+        this.setGroupCode(AppContext.getContext().getGroupCode());
+        this.setAppId(AppContext.getContext().getAppId());
     }
     }
 }
 }

+ 1 - 0
fm-person/src/main/java/com/persagy/fm/saas/role/service/impl/SaasRoleServiceImpl.java

@@ -12,6 +12,7 @@ import com.persagy.fm.saas.role.model.ConvertSaasRoleTool;
 import com.persagy.fm.saas.role.model.SaasRole;
 import com.persagy.fm.saas.role.model.SaasRole;
 import com.persagy.fm.saas.role.model.dto.*;
 import com.persagy.fm.saas.role.model.dto.*;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
 import com.persagy.fm.saas.role.service.ISaasRoleService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;

+ 3 - 0
fm-person/src/main/java/com/persagy/fm/workresume/model/WorkResume.java

@@ -37,6 +37,9 @@ public class WorkResume extends AuditableEntity<WorkResume> implements Serializa
     @ApiModelProperty("离职时间")
     @ApiModelProperty("离职时间")
     private Date departureDate;
     private Date departureDate;
 
 
+    @ApiModelProperty("是否是部门主管")
+    private String isLeader;
+
 
 
     public static String PROP_PERSON_ID = "person_id";
     public static String PROP_PERSON_ID = "person_id";
     public static String PROP_DEP_ID = "dep_id";
     public static String PROP_DEP_ID = "dep_id";

+ 10 - 6
fm-person/src/main/java/com/persagy/fm/workresume/model/dto/QueryWorkResumeDTO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * @author lixing
  * @author lixing
@@ -13,22 +14,25 @@ import java.util.Date;
 @Data
 @Data
 @ApiModel(value = "查询工作信息入参")
 @ApiModel(value = "查询工作信息入参")
 public class QueryWorkResumeDTO {
 public class QueryWorkResumeDTO {
-    @ApiModelProperty(value = "人员主键", required = true)
+    @ApiModelProperty(value = "人员主键")
     private String personId;
     private String personId;
+    
+    @ApiModelProperty("人员主键id列表")
+    private List<String> personIds;
 
 
-    @ApiModelProperty(value = "部门主键", required = true)
+    @ApiModelProperty(value = "部门主键")
     private String depId;
     private String depId;
 
 
-    @ApiModelProperty(value = "在职状态", required = true)
+    @ApiModelProperty(value = "在职状态")
     private String hiredState;
     private String hiredState;
 
 
-    @ApiModelProperty(value = "启用状态", required = true)
+    @ApiModelProperty(value = "启用状态")
     private String enableState;
     private String enableState;
 
 
-    @ApiModelProperty(value = "入职时间", required = true)
+    @ApiModelProperty(value = "入职时间")
     private Date hiredDate;
     private Date hiredDate;
 
 
-    @ApiModelProperty(value = "离职时间", required = true)
+    @ApiModelProperty(value = "离职时间")
     private Date departureDate;
     private Date departureDate;
 
 
 }
 }

+ 5 - 0
fm-person/src/main/java/com/persagy/fm/workresume/service/impl/WorkResumeServiceImpl.java

@@ -14,6 +14,7 @@ import com.persagy.fm.workresume.model.dto.QueryWorkResumeDTO;
 import com.persagy.fm.workresume.model.dto.UpdateWorkResumeDTO;
 import com.persagy.fm.workresume.model.dto.UpdateWorkResumeDTO;
 import com.persagy.fm.workresume.service.IWorkResumeService;
 import com.persagy.fm.workresume.service.IWorkResumeService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -154,6 +155,10 @@ public class WorkResumeServiceImpl extends ServiceImpl<WorkResumeMapper, WorkRes
                 queryWrapper.eq(WorkResume.PROP_PERSON_ID, queryWorkResumeDTO.getPersonId());
                 queryWrapper.eq(WorkResume.PROP_PERSON_ID, queryWorkResumeDTO.getPersonId());
             }
             }
 
 
+            if (!CollectionUtils.isEmpty(queryWorkResumeDTO.getPersonIds())) {
+                queryWrapper.in(WorkResume.PROP_PERSON_ID, queryWorkResumeDTO.getPersonIds());
+            }
+
             if (!StringUtils.isEmpty(queryWorkResumeDTO.getDepId())) {
             if (!StringUtils.isEmpty(queryWorkResumeDTO.getDepId())) {
                 queryWrapper.eq(WorkResume.PROP_DEP_ID, queryWorkResumeDTO.getDepId());
                 queryWrapper.eq(WorkResume.PROP_DEP_ID, queryWorkResumeDTO.getDepId());
             }
             }

+ 1 - 1
fm-person/src/main/resources/mapper/PersonMapper.xml

@@ -28,7 +28,7 @@
 
 
     <select id="queryPersonList" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonDTO"
     <select id="queryPersonList" parameterType="com.persagy.fm.person.model.dto.PageQueryPersonDTO"
             resultType="com.persagy.fm.person.model.Person">
             resultType="com.persagy.fm.person.model.Person">
-        select p.id as id, p.name as name, p.profession as profession, p.account_id as account_id
+        select p.id as id, p.name as name, p.profession as profession, p.account_id as account_id, p.person_type as person_type
         from person p,
         from person p,
         work_resume w
         work_resume w
         where p.id = w.person_id
         where p.id = w.person_id