人员es索引增加officeRegion字段及相关逻辑

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsUserInfo.java

@@ -172,6 +172,12 @@ public class EsUserInfo {
     private String superviseOrgCode;
 
     /**
+     * 管辖机构office_region--来源企业表
+     */
+    @Field(type = FieldType.Keyword)
+    private String officeRegion;
+
+    /**
      * 管辖机构名称--来源企业表
      */
     @Field(type = FieldType.Text)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataHandlerServiceImpl.java

@@ -1526,6 +1526,7 @@ public class DataHandlerServiceImpl {
                 esUserInfo.setUnitType(unitType);
                 esUserInfo.setSuperviseOrgName(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgName());
                 esUserInfo.setSuperviseOrgCode(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getSuperviseOrgCode());
+                esUserInfo.setOfficeRegion(useCodeEnterpriseMap.getOrDefault(u.getUnitCode(), new TzBaseEnterpriseInfo()).getOfficeRegion());
                 esUserInfo.setLicenses(this.buildUserLicenses(u.getSequenceNbr()));
                 esUserInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesUser(esUserInfo.getLicenses()));
                 return esUserInfo;

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -152,6 +152,10 @@ public class StCommonServiceImpl {
         return orgCode;
     }
 
+    public String getCompanyCode(String orgCode) {
+        return commonMapper.getOrgCodeByCompanyCode(orgCode);
+    }
+
     public List<RegionModel> getUserRegionCode(ReginParams selectedOrgInfo) {
         String regionCode = selectedOrgInfo.getCompany().getCompanyCode();
         Optional<RegionModel> op = regionModels.stream().filter(e -> e.getRegionCode().toString().equals(regionCode)).findFirst();

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/EnterpriseRefreshHandler.java

@@ -98,6 +98,7 @@ public class EnterpriseRefreshHandler implements IDataRefreshHandler {
                     esUserInfo.setUnitType(esBaseEnterpriseInfo.getUnitType());
                     esUserInfo.setSuperviseOrgName(esBaseEnterpriseInfo.getSuperviseOrgName());
                     esUserInfo.setSuperviseOrgCode(esBaseEnterpriseInfo.getSuperviseOrgCode());
+                    esUserInfo.setOfficeRegion(esBaseEnterpriseInfo.getOfficeRegion());
                 });
                 if (userInfosEs.iterator().hasNext()) {
                     esUserInfoDao.saveAll(userInfosEs);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/refresh/handler/UserRefreshHandler.java

@@ -87,6 +87,7 @@ public class UserRefreshHandler implements IDataRefreshHandler {
                     esUserInfo.setUnitType(unitType);
                     esUserInfo.setSuperviseOrgName(unit.getSuperviseOrgName());
                     esUserInfo.setSuperviseOrgCode(unit.getSuperviseOrgCode());
+                    esUserInfo.setOfficeRegion(unit.getOfficeRegion());
                 }
                 esUserInfo.setLicenses(commonRefreshService.buildUserLicenses(userInfo.getSequenceNbr()));
                 esUserInfo.setLicenseMinExpiryDate(RefreshCmService.getMinDateFromLicensesUser(esUserInfo.getLicenses()));