From c76adbf10f1d580d2c93a5505cbefd547ae882b2 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 25 Aug 2020 17:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E5=B1=8F=E8=94=BD=E8=AF=9D=E9=A2=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/ApiPartyGroupController.java     |  4 ++--
 .../epdc/service/impl/PartyTopicServiceImpl.java     | 12 +++++++-----
 .../src/main/resources/mapper/PartyTopicDao.xml      |  4 ++--
 .../epdc/service/impl/VolunteerInfoServiceImpl.java  |  1 +
 .../src/main/resources/mapper/VolunteerInfoDao.xml   |  4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java
index 888962cd..9d94bd37 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiPartyGroupController.java
@@ -182,7 +182,7 @@ public class ApiPartyGroupController {
      * @author Liuchuang
      * @since 2020/8/24 13:38
      */
-    @PostMapping("shield")
+    @PostMapping("topic/shield")
     public Result shieldTopic(@LoginUser TokenDto userDetail, @RequestBody PartyTopicShieldFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         formDto.setShieldUserId(userDetail.getUserId());
@@ -198,7 +198,7 @@ public class ApiPartyGroupController {
      * @author Liuchuang
      * @since 2020/8/24 14:35
      */
-    @GetMapping("detail/{id}")
+    @GetMapping("topic/detail/{id}")
     public Result<PartyTopicDetailResultDTO> topicDetail(@PathVariable("id") String id) {
         return partyGroupService.getTopicDetailById(id);
     }
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
index a0b8dee7..099f2788 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyTopicServiceImpl.java
@@ -167,12 +167,14 @@ public class PartyTopicServiceImpl extends BaseServiceImpl<PartyTopicDao, PartyT
         PartyTopicResultDTO partyTopicResultDTO = new PartyTopicResultDTO();
         //获取当前用户在当前党群禁言状态
         PartyUserGroupDTO userByGroupIdAndUserId = partyUserGroupService.getUserByGroupIdAndUserId(formDto.getPartyGroupId(), formDto.getUserId());
-        if(userByGroupIdAndUserId!=null && userByGroupIdAndUserId.getBannedEndTime()!=null && new Date().before(userByGroupIdAndUserId.getBannedEndTime())){
-            partyTopicResultDTO.setBannedFlag("1");
-        }else{
-            partyTopicResultDTO.setBannedFlag("0");
+        if(userByGroupIdAndUserId!=null){
+            if (userByGroupIdAndUserId.getBannedEndTime()!=null && new Date().before(userByGroupIdAndUserId.getBannedEndTime())) {
+                partyTopicResultDTO.setBannedFlag("1");
+            } else{
+                partyTopicResultDTO.setBannedFlag("0");
+            }
+            partyTopicResultDTO.setCurrentUserIdentity(userByGroupIdAndUserId.getIdentityFlag());
         }
-        partyTopicResultDTO.setCurrentUserIdentity(userByGroupIdAndUserId.getIdentityFlag());
         partyTopicResultDTO.setTopicList(topicLists);
         return new Result<PartyTopicResultDTO>().ok(partyTopicResultDTO);
     }
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
index 62c5b9df..e00186e3 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
@@ -285,7 +285,7 @@
         where id=#{relationId}
     </update>
 
-    <resultMap id="partyTopicResult" type="com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO">
+    <resultMap id="partyTopicDetailMap" type="com.elink.esua.epdc.dto.result.PartyTopicDetailResultDTO">
         <result property="id" column="ID"/>
         <result property="topicContent" column="TOPIC_CONTENT"/>
         <result property="nickname" column="NICKNAME"/>
@@ -298,7 +298,7 @@
             <result property="image" column="IMG_URL"/>
         </collection>
     </resultMap>
-    <select id="selectOneOfTopicDetailById" resultType="partyTopicDetailMap">
+    <select id="selectOneOfTopicDetailById" resultMap="partyTopicDetailMap">
         SELECT
             t.ID,
             t.TOPIC_CONTENT,
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
index 9578085e..78c4760b 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java
@@ -402,6 +402,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     public Result<EpdcAppVolunteerListCountResultDTO> listVolunteerV2(EpdcAppVolunteerListFormDTO dto) {
         int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize();
         dto.setPageIndex(pageIndex);
+        dto.setNickname(dto.getNickname().trim());
         List<EpdcAppVolunteerListResultDTO> data = baseDao.selectListVolunteer(dto);
         EpdcAppVolunteerListCountResultDTO volunteerListCountResultDTO = new EpdcAppVolunteerListCountResultDTO();
         volunteerListCountResultDTO.setVolunteerCount(baseDao.selectListVolunteerCount());
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 07cdce4c..08f097f2 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -228,8 +228,8 @@
         WHERE
           v.DEL_FLAG = 0
           AND v.AUDIT_STATUS != 2
-        <if test="nickname != null and nickname.trim() != '' ">
-          AND v.VOLUNTEER_NICKNAME like concat('%', #{nickname.trim()}, '%')
+        <if test="nickname != null and nickname != '' ">
+          AND v.VOLUNTEER_NICKNAME like concat('%', #{nickname}, '%')
         </if>
         ORDER BY v.VOLUNTEER_ORDER ASC ,CONVERT(v.VOLUNTEER_NICKNAME USING gbk)
         LIMIT #{pageIndex},#{pageSize}