修改bug

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java

@@ -92,8 +92,10 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
     private QueryWrapper<NoticeEntity> getWrapper(Map<String, Object> params) {
         String id = (String) params.get(FieldConstant.ID_HUMP);
-        String noticeTitle = ((String) params.get("noticeTitle")).trim();
-
+        String noticeTitle = ((String) params.get("noticeTitle"));
+        if(StringUtils.isNotBlank(noticeTitle)){
+            noticeTitle.trim();
+        }
         QueryWrapper<NoticeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
                 .like(StringUtils.isNotBlank(noticeTitle), "NOTICE_TITLE", noticeTitle);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -100,8 +100,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         String communityId = (String) params.get(FieldConstant.COMMUNITY_ID_HUMP);
         String gridId = (String) params.get(FieldConstant.GRID_ID_HUMP);
         String realName = (String) params.get("realName");
+        if(StringUtils.isNotBlank(realName)){
+            realName.trim();
+        }
         String mobile = (String) params.get(FieldConstant.MOBILE_HUMP);
+        if(StringUtils.isNotBlank(mobile)){
+            mobile.trim();
+        }
         String identityNo = (String) params.get("identityNo");
+        if(StringUtils.isNotBlank(identityNo)){
+            identityNo.trim();
+        }
         String startTime = (String) params.get("startTime");
         String endTime = (String) params.get("endTime");
         String isParty = (String) params.get("isParty");

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml

@@ -56,13 +56,16 @@
     </resultMap>
 
     <select id="pageDIY" resultMap="partyMembersDtoMap">
-        select pm.*,GROUP_CONCAT(DISTINCT(tag.TAG_NAME)) as TAG_NAME from epdc_party_members as pm, epdc_user_tag as tag,epdc_party_tag_relation as partytag
-        where 1 = 1
-        and pm.ID = partytag.PARTY_ID
-        and tag.ID = partytag.TAG_ID
-        and pm.DEL_FLAG = '0'
-        and partytag.DEL_FLAG = '0'
-        and tag.DEL_FLAG = '0'
+        SELECT
+        pm.*,
+        GROUP_CONCAT( ut.TAG_NAME ) TAG_NAME
+        FROM
+        epdc_party_members pm
+        LEFT JOIN epdc_party_tag_relation pt ON pm.ID = pt.PARTY_ID
+        LEFT JOIN epdc_user_tag ut ON pt.TAG_ID = ut.ID
+        AND ut.DEL_FLAG = '0'
+        WHERE
+        pm.DEL_FLAG = '0'
         <if test="realName != null and realName != '' ">
             and pm.REAL_NAME = #{realName}
         </if>
@@ -93,7 +96,10 @@
         <if test="endTime != null and endTime != '' ">
             <![CDATA[ and pm.REGIST_TIME <= ]]> #{endTime}
         </if>
-        GROUP BY pm.ID
+        GROUP BY
+        pm.ID
+        ORDER BY
+        pm.CREATED_TIME DESC
     </select>
 
     <select id="selectByIdNew" resultMap="partyMembersDtoMap">