Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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;
 }

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查询跟组织列表
      *

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);
 

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);
 
     /**

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();

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">