From a5f04bae6408c99f5e11a8481fc410199f7a15ea Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 16 Jun 2022 17:02:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/ResiCategoryStatsConfigController.java    | 1 -
 .../epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
index 3c2004e714..8d16dfdb23 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
@@ -75,7 +75,6 @@ public class ResiCategoryStatsConfigController {
     @PostMapping("list")
     public Result<List<IcResiCategoryStatsConfigResultDTO>> list(@LoginUser TokenDto tokenDTO,@RequestBody  ResiCategoryStatsConfigListFormDTO formDTO){
         String customerId = tokenDTO.getCustomerId();
-//        String customerId = "123123";
         return new Result<List<IcResiCategoryStatsConfigResultDTO>>().ok(resiCategoryStatsConfigService.list(customerId,formDTO));
     }
 
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java
index e95f209aba..a21534cdce 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ResiCategoryStatsConfigServiceImpl.java
@@ -81,6 +81,9 @@ public class ResiCategoryStatsConfigServiceImpl implements ResiCategoryStatsConf
 
         //2.获取ic_resi_category_stats_config 和 ic_resi_category_warn_config 表中的数据
         List<IcResiCategoryStatsConfigEntity> statsConfigEntityList = icResiCategoryStatsConfigDao.selectList(new QueryWrapper<IcResiCategoryStatsConfigEntity>().lambda().eq(IcResiCategoryStatsConfigEntity::getCustomerId,customerId));
+        if (!CollectionUtils.isEmpty(statsConfigEntityList)){
+            return icResiCategoryStatsConfigDao.listInfo(customerId,formDTO.getIsWarn(),formDTO.getLevel());
+        }
         List<IcResiCategoryWarnConfigEntity> warnConfigEntityList = icResiCategoryWarnConfigDao.selectList(new QueryWrapper<IcResiCategoryWarnConfigEntity>().lambda().eq(IcResiCategoryWarnConfigEntity::getCustomerId,customerId));
         //3.新增不存在的，删除不在tableColumnMap的
 

From 22cc7c450786395674e0199aa96a68c25f78259f Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 16 Jun 2022 17:04:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=B7=BB=E5=8A=A0=203:?=
 =?UTF-8?q?=E6=9C=AA=E5=87=BA=E5=94=AE=20=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/ImportGeneralDTO.java   |  2 +-
 .../com/epmet/dto/form/IcHouseAddFormDTO.java  |  2 +-
 .../com/epmet/dto/form/IcHouseListFormDTO.java |  2 +-
 .../epmet/dto/result/HouseChartResultDTO.java  |  2 +-
 .../com/epmet/enums/HouseRentFlagEnums.java    |  5 +++--
 .../java/com/epmet/entity/IcHouseEntity.java   |  2 +-
 .../epmet/model/ImportHouseInfoListener.java   |  6 ++++--
 .../epmet/service/impl/IcHouseServiceImpl.java | 18 +++---------------
 .../src/main/resources/mapper/IcHouseDao.xml   |  2 ++
 9 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
index 1bfeb17521..ca5408d581 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
@@ -98,7 +98,7 @@ public class ImportGeneralDTO implements Serializable {
     private String purpose;
 
     /**
-     * 房屋状态 1：出租 0：自住  2：闲置
+     * 房屋状态 1：出租 0：自住  2：闲置 3:未出售
      */
     private String rentFlagString;
     private Integer rentFlag;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
index 8882060a2e..a07f4fe886 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java
@@ -81,7 +81,7 @@ public class IcHouseAddFormDTO implements Serializable {
     private String purpose;
 
     /**
-     * 1：出租 0：自住  2：闲置
+     * 1：出租 0：自住  2：闲置 3: 未出售
      */
     @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private Integer rentFlag;
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
index 0e2e25a049..bfff2b0709 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java
@@ -48,7 +48,7 @@ public class IcHouseListFormDTO extends PageFormDTO {
      */
     private String ownerPhone;
     /**
-     * 房屋状态 【1：出租 0：自住  2：闲置】
+     * 房屋状态 【1：出租 0：自住  2：闲置 3:未出售】
      */
     private String rentFlag;
     /**
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
index 7a4e974162..aed43f1b0c 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChartResultDTO.java
@@ -50,7 +50,7 @@ public class HouseChartResultDTO implements Serializable {
 
     @JsonIgnore
     private Integer num;
-    //1：出租 0：自住  2：闲置
+    //1：出租 0：自住  2：闲置 3:未出售
     @JsonIgnore
     private Integer rentFlag;
 
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
index 27cd699bf3..32337f847d 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
@@ -8,7 +8,8 @@ public enum HouseRentFlagEnums {
     NO(0,"否");*/
     HOUSE_ZZ(0,"自住"),
     HOUSE_CZ(1,"出租"),
-    HOUSE_XZ(2,"闲置");
+    HOUSE_XZ(2,"闲置"),
+    HOUSE_WCS(3,"未出售");
 
 
 
@@ -41,7 +42,7 @@ public enum HouseRentFlagEnums {
 
     public static Integer getCodeByName(String name){
         if(StringUtils.isEmpty(name)){
-            return 0;
+            return null;
         }
         for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) {
             if (e.getName().equals(name)) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
index 5940608292..a535667426 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java
@@ -83,7 +83,7 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	private String purpose;
 
     /**
-     * 1出租；0未出租
+     * 1：出租 0：自住  2：闲置 3：未出售
      */
 	private Integer rentFlag;
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index b070543014..2d9bb999e8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -191,12 +191,14 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
-        if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("自住") && !dto.getRentFlagString().equals("出租") && !dto.getRentFlagString().equals("闲置"))){
+        //根据name 获取code 名字没有匹配返回null
+        Integer rentFlagCode = HouseRentFlagEnums.getCodeByName(dto.getRentFlagString());
+        if (StringUtils.isNotBlank(dto.getRentFlagString()) && rentFlagCode == null){
             nums.add(num);
             disposeErrorMsg(info,"房屋状态的值未填写或者所填写信息在系统中未找到");
             return;
         }
-        dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));
+        dto.setRentFlag(rentFlagCode);
         dto.setHouseName(dto.getBuildingName()+"-"+dto.getBuildingUnit()+"-"+dto.getDoorName());
         if (formDTO.getOrgType().equals(CustomerGridConstant.BUILDING)){
             disposeBuildingHouse(dto);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index 1e8ef58148..ef99e35c94 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -1,6 +1,5 @@
 package com.epmet.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -222,19 +221,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
             HouseListResultDTO dto = new HouseListResultDTO();
             dto.setHouseId(item.getId());
             dto.setHouseName(item.getHouseName());
-            switch (item.getRentFlag()) {
-                case NumConstant.ZERO:
-                    dto.setRentFlag("自住");
-                    break;
-                case NumConstant.ONE:
-                    dto.setRentFlag("出租");
-                    break;
-                case NumConstant.TWO:
-                    dto.setRentFlag("闲置");
-                    break;
-                default:
-                    break;
-            }
+            String houseTypeName = HouseRentFlagEnums.getTypeValue(item.getRentFlag());
+            dto.setRentFlag(houseTypeName == null ? StrConstant.EPMETY_STR:houseTypeName);
             List<HouseListResultDTO.CategoryListBean> categories = new ArrayList<>();
             if (null != countMap && CollectionUtils.isNotEmpty(categoryList)) {
                 for (IcResiCategoryStatsConfigDTO category : categoryList) {
@@ -302,4 +290,4 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         lqw.eq(IcHouseEntity::getHouseCode, houseCode);
         return ConvertUtils.sourceToTarget(baseDao.selectOne(lqw), IcHouseDTO.class);
     }
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index fcc9679915..c55f985fc5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -96,6 +96,7 @@
         (case when a.RENT_FLAG = '0' then '自住'
         when a.RENT_FLAG = '1' then '出租'
         when a.RENT_FLAG = '2' then '闲置'
+        when a.RENT_FLAG = '3' then '未出售'
         else '' end) as rentFlag,
         a.OWNER_NAME as ownerName,
         a.OWNER_PHONE as ownerPhone,
@@ -467,6 +468,7 @@
         (case when a.RENT_FLAG = '0' then '自住'
         when a.RENT_FLAG = '1' then '出租'
         when a.RENT_FLAG = '2' then '闲置'
+        when a.RENT_FLAG = '3' then '未出售'
         else '' end) as rentFlag,
         a.OWNER_NAME as ownerName,
         a.OWNER_PHONE as ownerPhone,

From ad55db68bde3b8322a9931a0656166535b26dd82 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 16 Jun 2022 18:33:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?"my-subagency-list"=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=B1=9E=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E6=A0=91?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=8C=85=E5=90=AB=E7=BD=91=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/GetAgencyListFormDTO.java  |  4 +++
 .../controller/CustomerAgencyController.java  | 14 ++++++++++
 .../java/com/epmet/dao/CustomerAgencyDao.java |  2 +-
 .../epmet/service/CustomerAgencyService.java  |  7 +++++
 .../impl/CustomerAgencyServiceImpl.java       | 26 ++++++++++++++++++-
 .../resources/mapper/CustomerAgencyDao.xml    | 11 ++++++--
 6 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
index 0d97988fd7..95c371ad83 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/GetAgencyListFormDTO.java
@@ -15,4 +15,8 @@ public class GetAgencyListFormDTO implements Serializable {
     private static final long serialVersionUID = -5846836779036328298L;
 
     private String customerId;
+
+
+    //当前登录用户id，从tokenDto中获取
+    private String userId;
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
index 557a987c09..5325163074 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
@@ -354,6 +354,20 @@ public class CustomerAgencyController {
         return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getAgencyList(formDTO));
     }
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param tokenDTO
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("my-subagency-list")
+    public Result<AgencyTreeResultDTO> getMySubAgencyList(@LoginUser TokenDto tokenDTO,@RequestBody GetAgencyListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
+        formDTO.setUserId(tokenDTO.getUserId());
+        return new Result<AgencyTreeResultDTO>().ok(customerAgencyService.getMySubAgencyList(formDTO));
+    }
+
+
     /**
      * @description 通过staffId查询跟组织列表
      *
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
index 892ef61681..02e483d9f2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
@@ -250,7 +250,7 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      */
     OrgResultDTO selectAgencyDetail(@Param("orgId") String orgId, @Param("orgType") String orgType);
 
-    AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId);
+    AgencyTreeResultDTO getAllAgency(@Param("customerId") String customerId,@Param("staffAgencyId")String staffAgencyId);
 
     List<AgencyTreeResultDTO> getSubAgencyList(@Param("pid") String pid);
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
index f3ac3c7212..dcdc1d44a8 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
@@ -255,6 +255,13 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
      */
     AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO);
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param formDTO
+     * @return
+     */
+    AgencyTreeResultDTO getMySubAgencyList(GetAgencyListFormDTO formDTO);
+
     List<StaffOrgsResultDTO> getStaffOrgListByStaffId(String staffId);
 
     /**
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
index f21337742e..adaf547abf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
@@ -24,6 +24,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.PartyOrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
@@ -32,6 +33,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -1136,7 +1138,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
      */
     @Override
     public AgencyTreeResultDTO getAgencyList(GetAgencyListFormDTO formDTO) {
-        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId());
+        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId(),null);
         if (CollectionUtils.isEmpty(agency.getSubAgencyList())) {
             agency.setSubAgencyList(null);
         } else {
@@ -1145,6 +1147,28 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         return agency;
     }
 
+    /**
+     * 工作端，获取当前登录用户所属组织及下级的组织树（不包括网格！！！！！！！！！！）
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public AgencyTreeResultDTO getMySubAgencyList(GetAgencyListFormDTO formDTO) {
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId());
+        if (null == staffInfoCacheResult || StringUtils.isBlank(staffInfoCacheResult.getAgencyId())) {
+            log.warn("com.epmet.service.impl.CustomerAgencyServiceImpl.getMySubAgencyList，没有找到工作人员所属的机关信息，用户Id：{}", formDTO.getUserId());
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取用户组织信息异常","获取用户组织信息异常");
+        }
+        AgencyTreeResultDTO agency = baseDao.getAllAgency(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId());
+        if (CollectionUtils.isEmpty(agency.getSubAgencyList())) {
+            agency.setSubAgencyList(null);
+        } else {
+            setAgencyList(agency.getSubAgencyList());
+        }
+        return agency;
+    }
+
+
     @Override
     public AgencyTreeResultDTO getOrgTreeData(String staffId) {
         AgencyTreeResultDTO result = new AgencyTreeResultDTO();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 2b6a9910ff..2fd5aa5feb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -620,7 +620,9 @@
         AND PID= #{pid}
         ORDER BY ID
     </select>
-    <select id="getAllAgency" resultMap="NodeTreeResult">
+
+    <!-- 如果传入了 staffAgencyId 查询当前组织及下级没有的话查询客户下所有组织   -->
+    <select id="getAllAgency" parameterType="map" resultMap="NodeTreeResult">
         select
             ID AS agencyId,
             ORGANIZATION_NAME AS agencyName,
@@ -630,8 +632,13 @@
             customer_agency
         where
              DEL_FLAG = 0
-            AND PID ='0'
             AND CUSTOMER_ID = #{customerId}
+            <if test="staffAgencyId != null and staffAgencyId != ''">
+                AND id = #{staffAgencyId}
+            </if>
+            <if test="staffAgencyId == null || staffAgencyId == ''">
+                AND PID ='0'
+            </if>
     </select>
 
     <select id="getStaffOrgListByStaffId" resultType="com.epmet.dto.result.StaffOrgsResultDTO">

From c6e0295ad266ecfbcee1f0b0dcf5c7aa11e8003b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 17 Jun 2022 10:43:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=203:=E6=9C=AA=E5=87=BA=E5=94=AE=20=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/excel/house_template.xlsx  | Bin 9660 -> 9675 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx
index 9af88daba071450cde3fa85368d31e86d61e5696..c722017f3109410cd9fdfa55dc7a89acd840f0b5 100644
GIT binary patch
delta 5150
zcmY+Ibx_m~^T+Q1Dd~ozxdQ}gq!g*68{wou_=1!mC?Rzq-SOc_C8R`}qfw+mKsqEO
zj_#0-<L7stXP%kg{;@l=^WNQ=-M{wrRdYbIDg}HGSrU6}2xNd+kqVlf!Zf`H?-%n{
z7r6H%P$OQsH2`jVG)4gGW>&4OM74KD`^5KreFm^n|J5t}s$n*duxa)7?(*B6A2hpS
zpu-RU)v*RQFA3qX{ISNWM@H_P%X$vSurc>Nem)|i*&v1SlMCMU=wpq}x(XVHtdJvS
zb*6r!_lPOJ=;~#DByR@M2PGMI{jFpZ?@7%v2IN1QZIm25jd%liXc9?zt5bNb67d4p
zBp_%Sw8TKnt6&<^$=)SrdB0g4`P2awj2_%mY0B_&k8o*!T<u+{y#U#1CfnABbgq#f
z-QH{$u}luzq4~*p<L(uk<DyYI4LJu^Y;OBqK6<YtjD>COH(Y08n7b~yf46?^x$vH;
zp50`j2;Jxy5xlZ&f>@Z_i>0VQpB#1e@c^+DGK|j@Su-mL4zgZb<jtRA(-@>bgk;-u
z<gHM~eFD3atIf?vuyNkv>uKWR(SSf8LQsSbMxK`PT{FOh%ZYRjk*5eh2*XC$9qa^l
zO)^YSJW|}s3oBZ%v!GV+?zR{YAG=#1bu{(eER-cXI2;rcJG%1RY}eN*8s`h1;G$52
zy&W$Jz{&B3nJQYllxH?iYj7VzNzIEJB#%}KRHbKhn3gE|p@-IcjUB%tLztabnv9zY
zCdc*6p6mFP%^~ZlYesBX3u@9SsjNjHr3B)E%S&MmGPB<~Ap%2QMYA7OinDrh4yhdo
z<{lCG^ZQuRe0beeuOH8w#~4kgAK8~oky`yVR$|VZu;-0fi2P)T*)4Xf{Y93^FPHtR
zqGUjcZSM=4RqRIt6)B}wRoV4>^BW@AcpLvm7sUgZZ4X%5bGh)Bu?DR6YvIC+JRD|Y
zyu2|V+<aOIKXKmt#Lpr3d}n(FPGkb!;VF={KxGvHJP?SF1O#FL0kJS9WH-Xh4WdjF
zsEUy*L(uA0oMX(GU7l-?iM!gCa25t+@5b-x+k4leSEQD~9PG94BiJ7meo|!T;M9|U
zfCJxz9los5ITn&a+diJrR5lDf4Eg4_{zr1L>F0+Y6lsFfPI^S>rS@;W%;xZbh^DTC
zN2lIyLYCR1b$aZJ$|;wP$Pzb<-uE%zKXE;YM|D*R)gwXe<XOH}k=9efip2@CG;}6G
z0mfUR`yAlPuP;Nvy?t?atNNW1Kff$<V0NNkq*{fBc(!!4-ydZ3`9&WcY8#EWNq!9_
z<Z*%Qhh3P*hcE5Ghoz(LJK6QWM2THJ!Mvucso<3v6icZsOY_XnMjnp85rs>)A5&OC
z@X~^%KpO}mn2ng%bGJtriUo{H=`s~z$l%8w_l6RyI{U{kmR%7HS$pT<JeqrCo4Du~
z<*zXFoy@^yK3iw1U--a-CflHY;PLD`KCI7(yChQDW$PjYB!!C}e?VsM)-$}krJFXN
zSH|UAXZ)sVKI*nzk2EPu-OJGUX|Q;OcT5Hmd@;6jUk|~L@QfqHgFUtE*-7u<yfNC}
z5hl)RYgnf=scK%&iz~9kd1+avz$@{<P*DDZ0&lt`!X|EuM*p3bVGflEs&?!?rOAjw
zHMG<;^K!Zd`U5_DahY?QvZe1H4b%qVIX#ksIE_$J2yYr)AQ9DiQ3mUv9}@NU<y0xb
zT<y<knegNhid7X2gW=VJTfLD@4?8qC*J(d_#CPg&($z#7P`L}l@bXZ`n80CCjoHeE
zKxE;=PpR-)bYun;qe7>z%js%QiQxM@Af0Gv_*gm-UB#5R>)2zrv0i}4Tq#N~n$l1X
z5F|(@zV;_WLTS&#nAP|Wr#;w9`h;}YYw!icXybN(NwiFzL6k{<aDnLfkm9bPz3ZyH
zfvKwwd-a$>ca7$nMqO$$x=io&pmwKQ&YF;G>(IMTVk}Yf9hW%jc-GBX#XPl6f%Ne~
zk0YrrQ0E2fRl($tw7fz<GxHb8Qdt3%ra7F~u2UKree=ju{$!?Vj{tYH{Y9iN2v8>M
zasD8dE&L@5XKc)=4{R-;H0isu5ERv*+9IS%j^%?72gV^;Zx{kv3K2{_G_%6VU$D<m
zdW?)H)rh%KEP})L<i{wRF7arwm8zK>?WYinORp2mi<4#YquJ%N&7~zD0?Yb9Ip3r1
zyB(zJT=pw7d&Y_>r>Q*P+HdI@NAumy#kCu8aRO5M>AX;E>nyHPE&8sx!(x|$T)(jt
zcQDENwOyHwNEd^B^RyuA!_qAY%HyG@zb}thx5h`$HhLFjBiaos#7`ak4p#F!0Xa4m
zvljbN@x{u{V&h6S+3VetBe!1Nr>wG9(pShO*hCRu=MXGCT5v5CKXbcmwMW;>c~HUv
zz1*ysX4?;<RtJ%eDtuMVZQ<Qle3Q}5WbSJoC%&y*#qOGE#BEI$#da-BY5ThWAwoXS
z=%c?=^OT*|s*r;Bz%8PR0napu{epj0mXMxAD3&@sW<|nn8@%$Ki*vOgU&1t2nuA%o
zU}F*XNiOxFs+_=EitaJO@jCH7v43RN8nF0@tmq^nE_@<3zfi?IVh|`D_(skJ4hNRW
zS&)xu)UxbdAOF*q=sFXPvt#Nr(}{WYy9(a|2+UBc&N-v?+K0V6Xc{Y2E2dI5BQN63
z{(kN~B%5}g2$?3kuJGtRi-?zWKuw%#s8<uPRPK<RnHI7wicV+3>==wgD%N~)Ta09C
zA_|?e7O_)3!crc4S=aR}ylpnZE~vARCFGJ*)05rZxd7+JeU@Li7lj*_0sKLgSj%@l
zOLGWswa6=1lTyR&wbnHfjVwrr{^BlyQsGJ*zCvjM`kBVXz>bAfNoq=>+1$>1z6R96
zgXgWtHI23UV<u_r3={V3w^i)drMkL9wr?1M29$v`UDzdp`l8}_k?|jDoO9>tb>yGv
z;>(DMyX!0HlgPoyrr{eV#?*`Ju$0l72TB4OV{mMKF8-OCG}G^&aoLhfA!Q}P{i}oP
zJ%`$B@oP9(aT!I#BH8x@UF0ohM#-ZB?RKfuX6j>N#Iw=QaYS<;Wx3y!U3uZxQl9LX
zISrXZX>bpn@I^1Fg|vzt-e`5;AcJIclcU)ROcM2n1dV_AKU)h|uG!2mG;!K2e_N_z
zJX;3gKYW=f-Q>R2No(5)wHN5-jb0<WhY71ndiNFYZSIjNnGBxeBaBFU{XJX##3}Ro
zTAEc!Fz3&(_i$lyQj5_3FX~UbwkI|NQCgz>6v@yV0RwhTGjvC+#05GVKnf=o2uid8
zJ^P9Zt+_7-?CfLY9cy>$x_!qo<d(&?j(-sGK$n>A<G=*8!u95*Dh8ZP)5AK&vLFNq
zieK2a&>Ym}#ndR6h8*{Eb<{UI#SGumY&Vt?ChhJS!tm^!w^4L{ubv1f1TaYz>{gVG
zH#<pQ%`m>*Q-bgv_!_%%AnVXy(gmxX7*z5R&Qpd;<3=IIIi)vDeUe|a^D7v&>l8mW
z`CsCn``~s-PWqx}#819t0(U#+SdAO<n0^NL%c~rtfT9`Kjj*~kMHvZov1K4ZJ<f>K
zO1yij@y5TC=lJxL>2h_&+4Ndajw?^v8YUR#<5KH=?D1gWDSvex(qd8Mx%G~QsBESq
z0^>YBKO^eVe<DpQ^x3D+`#82nDET{;+FFXwC=^X4HVSQ_y6nUHzo4TR*UMv+4m0G+
zi6S6%Z2ch|ZQlIVB2XaM11kw9vzY2o^qv0GQl(l5pHr&RrpTF_f4yf3qOCvJ-2?7|
zz2&!G2@!sM%KVlE={yWE7GzFU66A!rxVAq<l+x^u2YfzEEqX-!byFuWqbi}X*izFo
zm#@H**r~!&bN#cSrxMbV*jsRr?l7LjP~@&ca@O+|$R?68wQk8?<l7q2Yc2+@bCc)~
zt-n200=RjI*AC;g5R}zJIQ?944dTZfM8dQ?XqpF+IWYM~<nZSSPM6j5arA5?Z_P|3
zq3GWz=#<aw7nuijE*u-2&CuYi7DsWHmRB;+xi}UB5NBVdO7W9S1UVS%R8uHVixK`!
z-mzvfnMfRO6TQehOza33c|1`w7(@ugFVY)Ci)2Q<usQfu;Rg)1$!%57SV*$Zu$<{d
z;ENX~Y9j;3@D$0G7ku6_3~er_{UjamJi`z016knIvq`ax>5l|g*6X6@UI=9f(6oq{
zk-COiw?=!uUShp<m{_a}03^_Q0-G}erfG)<)3&4+C6HG7Umt_&rw!Yx+;X9gzaw2L
z6@|1!Q1I-s4r|(H>ZI*zA*T<g4es?0F&^IFGaxgQ8xgtt%!T!cFhxuc&V!P1l~Q5d
zHUs{6+LC1MRch7(?oish)Ji$`Hu+Hcz8ne$_t|eL`xDk2rtIFyAE<xYI1IiRKwoHd
zaKAZ1J#^`T=a(z6(^4n%5xX0yW$=HbN;)8h@bbC5>;*{0>*(GF>7T0gH0ScdSG4C%
zwU7eU{P(jMjnZ#z45N=o7S{~{8-d#S_w-j5>GAMI8?pusR*FbE%hhyeBEpX=KVa8n
z`Faf2k^3k|Wha%HE9Q=W;&qyA1l7A^Lc6EFq?%Wq1|LdVt@)$iKyFaarA#zePDqao
zQPyV?Rak=I8s;IDdl`Lc$B4Se*SA>cBV@U_E-guUuFkHxL5h_qiqfgBgYJ#Goq>B&
zkke|%looFtF&8=Ua4BwRi^o8D4u#Zxv(Ee^?m|(aCmSJR5sox4?o~DI&+#z@P*aB>
zQxld9q^II~p{8Wkr_-dRc?``hVSd=R^CUz0PG39Aewup0)GSebnX$HflY9reE#&8_
z2Vx~xcwui?w?!9%$<J3t5&pL*FAS=40jGZT2MJdT0BVi7j2MbuR<`7^?uH!FyMfh`
z3FL>3SfS%~1JpL&Jvqw-1jP?%=npLNRQevuPT;Rex;LK7F21AY)|vQIEk!uUNEP<g
zzN>Y4PIe=)HrD<<JE;tz*u)*D7xH^mu3_Jw#qzO>t#Nek0jKqDJTrZE?)^>@nZhEX
zZPWp;bN@xD&@k5B?f81-2vFU~3G_e1ZV*o_ax}LcMXJZ0scOF&O>UIWCT^mDx*IJm
zM8oN$=wh?2!J`qw(Y>+?Nk=b-+2Rj!x~PI_^yLZO!#`ygNJ7-oe^8|HAzz6NyU4C6
zBCO1>oh~xpJMP`x`rMrC8T%Rdzb2mTk`_Q<1i2F*7D~NC)tBpzf4^DzbL96u^X9hG
zn0rQY1%9#><(LU?tXfrVz>`kndj%UF#Ghx$(+T}3=$X-lYfet-Zge#pHRxOAqU5&1
z^`@Xr`-C_|$RfpEVkC%D0l6}>m1C9t)P|KJkH9k}6pjH`G)KxfSS1TfeZL-xDb`Kb
zqV#$#q@tM2u<L&azt}P$iPg;(spdS+Wm)00$!M<~h<wc0+z)l(zI&2Af9v)zW52^A
z`H=C_F(vl9l-+d9=l2%A8Ii;LI@q_Ofrl+ew|;<bt4*y9SqQ8u6q&kOwIam$!;lIn
z`u2mTcOwU@u<S|^j5}v1DxDzrSPpCLaV`SA{n3lG#ZexdD3IaC3A)F&XSw7`y2vlS
zH>KuA$8|Eq#zV|@l*28PZ*p9W$`OlG-c=)jiu@Ftsl`ni2=|+$%86r}_dD7JuMYl6
zcpBS1j@8iNExyM5L88YihuJ>1-faFx-_6S*FZ_?QsC(q$DdK8Mx+27ss$azQc`^rk
z2=VU~Uw=vYIRku;MP3I-QZ`aicd&RwRZ>0U%=%<)-{$i6T`hK}67<ZzDLvczOOl!n
zoTu;p23<O`dNng84vMb1!M6k1=W1G{N#SUb3p1ii)LEo)kqpOPkHxh$pNXsRMbp+4
zhN%@saYSq2Q`fu-ameL@WB$O+G6vKJU^e-hGw>Qlcw2Qk;nfpp4Ggzi_DPtC<69Wt
zuqdBH%xO@1+9qZAsn%3P|Gja=ajB8xZt;|};Cl%KqYGY$Ib7jpuVJR9c7Ze7(yj!g
z8rx~GNOVOra(Vs;r~i`?rq?Zz=Xb}68ymhG$?}o-MP;mivC-Aq5Tf(ff=FGRy<KTj
z(eu68O#Qi8%hIjA^1WB%pB+$VW)vc;sJQ3kMgi+}aRJ3EeoB?}W!_6*nab%mGH1In
zkhmJk@6D9y<}A&xQEZHm2S^~t88woo7qBg;2l+rp1kq=$d9LA#WkY)~)q{yFr$LG0
zU=ZjK5MgFO4(N0WQ+(w*BA;3)89&LRdQ{S-dGekQyymj2Z97@bHOH}bFazaV>vQz>
z+B+Kb`6fLX9*{>qJHuQA;4zqPrPN0-FDz!eBH9#b5JW2v*AL^s65Xeh&2O+5Tk}bj
z!KBiLA`*-n3JBvEVRur~*_5GaPO1|ER;C2SFk%tpRCuv^&1&5Uol5xNT|_6UF!f^T
zAG7>8t|(P5&L89`R~(uh1IT<re7Zv>y*{uHfbHRt2^y+~(u0J}WI`eLgcl{e%Oz^R
zeS|$Y#7wUaQE&d<f8@0+dcd($YgBPP!iSJ9C^b@Kj7Ptmh~P6Q+j7Y`@xLMOrNDD1
zMa_sStU0p{rBEI0q=xDph-t?ye%We!-O3%7^mzD6l=;Ij{eyRjL;X{J#2eWX(y_zY
za-|o45d}JmMIH}K2lR8ug9Cy4oMPZlfE*|AU#vFGDFgWz`f&f<G6@a{MEw^9{cB(l
z`(IB4JmiuGTLZ7Sgu(qlHkSm>5i5XYWd@G9_`se33zP@)zc0c71S0*n@~{1;xCF3*
z%7DFqOsE9-BQOf(hWziGe}|F(NBUna3qS>X0uBarVH}YEk5m35`%lMmAO^;dU%~Nj
G?*9Nl_r<FK

delta 5201
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