From 609f2b05dcaa36f2af642a471d7135f8369c339a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Dec 2021 17:22:28 +0800
Subject: [PATCH] =?UTF-8?q?pc=E6=8C=87=E6=B4=BE=E6=97=B6=E5=BF=97=E6=84=BF?=
 =?UTF-8?q?=E8=80=85=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E4=B8=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87=E5=8F=8A=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=BF=97=E6=84=BF=E8=80=85.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/VolunteerInfoDao.java |  8 --------
 .../java/com/epmet/entity/VolunteerInfoEntity.java    | 11 ++++++++---
 .../epmet/service/impl/VolunteerInfoServiceImpl.java  | 10 ++++++++--
 .../src/main/resources/mapper/VolunteerInfoDao.xml    | 10 ----------
 4 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
index 5dcd379c4b..ab0b65bf9c 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/VolunteerInfoDao.java
@@ -74,12 +74,4 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @date 2020.08.13 10:06
     **/
     List<String> selectVolunteerIds(@Param("customerId")String customerId);
-
-    /**
-     *
-     * @param customerId
-     * @param pids 查询当前组织及下级，所有的志愿者
-     * @return
-     */
-    List<String> selectVolunteerByPids(@Param("customerId") String customerId, @Param("pids") String pids);
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
index fcce38bc75..0f12f0f710 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 志愿者信息
  *
@@ -67,4 +64,12 @@ public class VolunteerInfoEntity extends BaseEpmetEntity {
 	 * 志愿者注册，所在网格名称
 	 */
 	private String gridName;
+	/**
+	 * 网格所属的组织id
+	 */
+	private String pid;
+	/**
+	 * 网格的所有上级
+	 */
+	private String pids;
 }
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
index 7c2ba743c7..ef5af0c4f4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
@@ -68,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -256,12 +257,17 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         }else{
             pids=staffInfo.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfo.getAgencyId());
         }
+        LambdaQueryWrapper<VolunteerInfoEntity> query=new LambdaQueryWrapper<>();
+        query.eq(VolunteerInfoEntity::getCustomerId,customerId);
+        query.likeRight(VolunteerInfoEntity::getPids,pids);
+        query.select(VolunteerInfoEntity::getUserId);
+        query.orderByAsc(VolunteerInfoEntity::getCreatedTime);
+        Set<String> userIds = baseDao.selectObjs(query).stream().map(o->o.toString()).collect(Collectors.toSet());
         List<OptionDTO> resultList = new ArrayList<>();
-        List<String> userIds = baseDao.selectVolunteerByPids(customerId,pids);
         if (CollectionUtils.isEmpty(userIds)) {
             return resultList;
         }
-        Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        Result<List<UserBaseInfoResultDTO>> userInfoRes = epmetUserOpenFeignClient.queryUserBaseInfo(new ArrayList<>(userIds));
         if (userInfoRes.success() && CollectionUtils.isNotEmpty(userInfoRes.getData())) {
             Map<String, UserBaseInfoResultDTO> userMap = userInfoRes.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity()));
             for (String userId : userIds) {
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 9f3f83baa4..4dc80881f2 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -75,14 +75,4 @@
         AND CUSTOMER_ID = #{customerId}
         order by CREATED_TIME asc
     </select>
-
-    <select id="selectVolunteerByPids" parameterType="map" resultType="java.lang.String">
-         SELECT
-          distinct USER_ID
-        FROM volunteer_info
-        WHERE DEL_FLAG = '0'
-        AND CUSTOMER_ID = #{customerId}
-        and pids like concat(#{pids},'%')
-        order by CREATED_TIME asc
-    </select>
 </mapper>