userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId());
+ if(!userDTOResult.success()){
+ return new Result().error("获取用户信息失败");
+ }
+ commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag());
boolean isIssue = true;
boolean isComment = true;
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
new file mode 100644
index 000000000..f65137cae
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.modules.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.modules.feign.fallback.UserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 用户接口
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class)
+public interface UserFeignClient {
+
+ /**
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 查询用户基础信息
+ * @Date 2019/12/16 9:57
+ **/
+ @GetMapping("app-user/epdc-app/user/getById/{userId}")
+ Result getUserInfoById(@PathVariable("userId") String userId);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
new file mode 100644
index 000000000..a73572852
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.modules.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.modules.feign.UserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户接口 Fallback
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class UserFeignClientFallback implements UserFeignClient {
+
+ @Override
+ public Result getUserInfoById(String userId) {
+ return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId);
+ }
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
index 764b5eefc..1f325a7cf 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
@@ -24,6 +24,7 @@
+
@@ -82,6 +83,7 @@
+
@@ -100,6 +102,7 @@
t2.USER_ID,
t2.USER_FACE,
t2.USERNAME,
+ t2.PARTY_FLAG,
t2.LIKE_COUNT,
t2.UN_LIKE_COUNT,
t2.userLike,
@@ -122,6 +125,7 @@
t1.USER_ID,
t1.USER_FACE,
t1.USERNAME,
+ t1.PARTY_FLAG,
t1.LIKE_COUNT,
t1.UN_LIKE_COUNT,
(t1.REPLY_COUNT + t1.LIKE_COUNT + t1.UN_LIKE_COUNT) AS attitudeNum
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
index fb0c34c86..f9557b25c 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
@@ -16,10 +16,10 @@
AND ugp.GROUP_ID = #{groupId}
AND ugp.STATE = 10
- AND ugp.NICKNAME LIKE concat('%', #{nickname}, '%')
+ AND ugp.NICKNAME LIKE concat('%', trim(#{nickname}), '%')
- AND ugp.MOBILE = #{mobile}
+ AND ugp.MOBILE = trim(#{mobile})
ORDER BY
ugp.LORD_FLAG DESC,
@@ -97,4 +97,4 @@
UPDATE epdc_user_group SET PARTY_MEMBER = #{partyMember} WHERE USER_ID = #{userId}
-
\ No newline at end of file
+
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
index cad584143..43977bd78 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
@@ -219,7 +219,7 @@
AND temp.GROUP_ID = #{groupId}
- AND temp.TOPIC_CONTENT like concat('%', #{keyword}, '%')
+ AND temp.TOPIC_CONTENT like concat('%', trim(#{keyword}), '%')
ORDER BY