修改测试bug

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -831,7 +831,7 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setNickname(user.getNickname());
             formDto.setUserAvatar(user.getFaceImg());
             formDto.setMobile(user.getMobile());
-            formDto.setDeptId(user.getGridId());
+            formDto.setDeptId(user.getDeptId());
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
             groupFeignClient.updateUserPartyMember(formDto);

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java

@@ -87,7 +87,7 @@ public interface GroupNoticeConstant {
     /**
      * 转议题-通过-内容-发布话题用户
      */
-    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在 党群议事查看。";
+    String NOTICE_TOPIC_TO_ISSUE_PASS_TOPIC_USER_CONTENT = "您的话题已经被群主转成议题，可在党群议事查看。";
 
     /**
      * 我的消息类型：0审核通知

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/GroupSettingStateDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 /**
@@ -32,6 +33,7 @@ public class GroupSettingStateDTO implements Serializable {
     /**
      * 处理意见
      */
+    @Size(min = 0, max = 500, message = "处理意见在500字以内")
     private String processingOpinions;
 
     /**

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/TopicAuditRecordResultDTO.java

@@ -24,7 +24,7 @@ public class TopicAuditRecordResultDTO implements Serializable {
     /**
      * 处理意见
      */
-    private String processionOpinions;
+    private String processingOpinions;
 
     /**
      * 审核时间

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml

@@ -147,10 +147,7 @@
             ugp1.NICKNAME,
             ugp2.LORD_FLAG,
             COUNT( DISTINCT tp.ID ) AS topicNum,
-        CASE
+            COUNT( DISTINCT tp1.ID ) AS changeToIssueNum
-                WHEN SUM( tp.STATE = 10 OR tp.STATE = 15 ) IS NULL THEN
-                0 ELSE SUM( tp.STATE = 10 OR tp.STATE = 15 )
-            END AS changeToIssueNum
         FROM
             epdc_group gp
             LEFT JOIN epdc_user_group ugp ON gp.ID = ugp.GROUP_ID
@@ -166,6 +163,9 @@
             AND ugp2.USER_ID = #{userId}
             LEFT JOIN epdc_topic tp ON gp.ID = tp.GROUP_ID
             AND tp.DEL_FLAG = '0'
+            LEFT JOIN epdc_topic tp1 ON gp.ID = tp1.GROUP_ID
+            AND tp1.DEL_FLAG = '0'
+			AND (tp1.STATE = 10 OR tp1.STATE = 15)
         WHERE
             gp.DEL_FLAG = '0'
             AND gp.ID = #{id}

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

@@ -589,6 +589,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
         userDto.setLeaderFlag(relationInfo.getLeaderFlag());
+        userDto.setFaceImg(oldEntity.getFaceImg());
         return new Result().ok(userDto);
     }