Browse Source

Merge remote-tracking branch 'origin/master'

tags/24080901
WendyYang 1 year ago
parent
commit
db637de165
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

+ 4
- 0
pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java View File

@@ -123,6 +123,10 @@ public class UserInfoManage {
} }


private List<String> getCompliantOrgEmpCodeList(String orgName, String orgCode, Long regionId) { private List<String> getCompliantOrgEmpCodeList(String orgName, String orgCode, Long regionId) {
if (regionId == 331100L){
// 丽水默认查全部
regionId = null;
}
if (StringUtils.isBlank(orgName) && StringUtils.isBlank(orgCode) && Objects.isNull(regionId)) { if (StringUtils.isBlank(orgName) && StringUtils.isBlank(orgCode) && Objects.isNull(regionId)) {
return null; return null;
} }


Loading…
Cancel
Save