Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -2,6 +2,7 @@ package com.ningdatech.pmapi.user.manage;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.exception.BizException;
@@ -46,7 +47,8 @@ public class UserInfoManage {
 
     public PageVo<ResUserInfoListVO> list(ReqUserInfoListPO reqUserInfoListPO) {
         LambdaQueryWrapper<DingEmployeeInfo> wrapper = Wrappers.lambdaQuery(DingEmployeeInfo.class)
-                .eq(DingEmployeeInfo::getMainJob, "true");
+                .eq(DingEmployeeInfo::getMainJob, "true")
+                .eq(StringUtils.isNotBlank(reqUserInfoListPO.getOrgCode()), DingEmployeeInfo::getOrganizationCode, reqUserInfoListPO.getOrgCode());
 
         Page<DingEmployeeInfo> page = iDingEmployeeInfoService.page(new Page<>(reqUserInfoListPO.getPageNumber(), reqUserInfoListPO.getPageSize()), wrapper);
         List<DingEmployeeInfo> records = page.getRecords();

pmapi/src/main/java/com/ningdatech/pmapi/user/model/po/ReqUserInfoListPO.java

@@ -25,6 +25,9 @@ public class ReqUserInfoListPO extends PagePo {
     @ApiModelProperty("所在单位（主职）")
     private String orgName;
 
+    @ApiModelProperty("所在单位Code（主职）")
+    private String orgCode;
+
     @ApiModelProperty("所属区域")
     private Long regionId;