修改社群测试bug

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiGroupController.java

@@ -137,7 +137,7 @@ public class ApiGroupController {
      * @since 2019/10/23 9:13
      */
     @GetMapping("listOfMember")
-    public Result<List<GroupUserListResultDTO>> listOfMember(@RequestBody GroupUsersFormDTO formDto) {
+    public Result<List<GroupUserListResultDTO>> listOfMember(GroupUsersFormDTO formDto) {
         return groupService.listOfMember(formDto);
     }
 

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/dao/UserGroupDao.java

@@ -85,12 +85,12 @@ public interface UserGroupDao extends BaseDao<UserGroupEntity> {
      *
      * 获取社群成员信息
      *
-     * @params [groupId, userId, state]
+     * @params [groupId, userId, states]
      * @return com.elink.esua.epdc.dto.group.UserGroupDTO
      * @author liuchuang
      * @since 2019/10/23 13:47
      */
-    UserGroupDTO selectOnOfUserInfo(String groupId, String userId, Integer state);
+    UserGroupDTO selectOnOfUserInfo(String groupId, String userId, int[] states);
 
     /**
      *

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/UserGroupService.java

@@ -138,12 +138,12 @@ public interface UserGroupService extends BaseService<UserGroupEntity> {
      *
      * 获取社群成员信息
      *
-     * @params [groupId, userId, state]
+     * @params [groupId, userId, states]
      * @return com.elink.esua.epdc.dto.group.UserGroupDTO
      * @author liuchuang
      * @since 2019/10/23 13:46
      */
-    UserGroupDTO getGroupUserInfo(String groupId, String userId, Integer state);
+    UserGroupDTO getGroupUserInfo(String groupId, String userId, int[] states);
 
     /**
      *

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -258,7 +258,8 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     @Override
     public Result modifyMemberState(GroupUserRemoveOrQuitFormDTO formDto) {
         // 获取成员信息
-        UserGroupDTO userGroupDto = userGroupService.getGroupUserInfo(formDto.getGroupId(), formDto.getOperatorId(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
+        int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
+        UserGroupDTO userGroupDto = userGroupService.getGroupUserInfo(formDto.getGroupId(), formDto.getOperatorId(), states);
         // 获取群主信息
         UserGroupDTO lordGroupDto = userGroupService.getLordInfoByGroupId(formDto.getGroupId());
         // 获取社群信息
@@ -297,6 +298,12 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result applyForGroup(GroupApplyFormDTO formDto) {
+        // 检查用户是否已申请入群
+        int[] states = {GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
+        UserGroupDTO userGroupDto = userGroupService.getGroupUserInfo(formDto.getGroupId(), formDto.getUserId(), states);
+        if (null != userGroupDto) {
+            return new Result().error("您已申请过加入该社群，请等待群主审核");
+        }
         UserGroupEntity userGroupEntity = ConvertUtils.sourceToTarget(formDto, UserGroupEntity.class);
         userGroupEntity.setLordFlag(NumConstant.ZERO_STR);
         userGroupEntity.setState(GroupUserStateEnum.GROUP_USER_STATE_PENDING_REVIEW.getValue());

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/UserGroupServiceImpl.java

@@ -137,8 +137,8 @@ public class UserGroupServiceImpl extends BaseServiceImpl<UserGroupDao, UserGrou
     }
 
     @Override
-    public UserGroupDTO getGroupUserInfo(String groupId, String userId, Integer state) {
+    public UserGroupDTO getGroupUserInfo(String groupId, String userId, int[] states) {
-        return baseDao.selectOnOfUserInfo(groupId, userId, state);
+        return baseDao.selectOnOfUserInfo(groupId, userId, states);
     }
 
     @Override

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -201,7 +201,8 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
         // 群主关闭话题
         if (NumConstant.ZERO_STR.equals(operatorUser)) {
             // 获取用户信息
-            UserGroupDTO userDto = userGroupService.getGroupUserInfo(topicDto.getGroupId(), formDto.getUserId(), GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
+            int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
+            UserGroupDTO userDto = userGroupService.getGroupUserInfo(topicDto.getGroupId(), formDto.getUserId(), states);
             if (null == userDto || !NumConstant.ONE_STR.equals(userDto.getLordFlag())) {
                 return new Result().error("您不是群主，不可以关闭话题");
             }
@@ -358,7 +359,8 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             return new Result().error("话题转议题失败，当前社群已解散");
         }
         // 校验用户身份
-        UserGroupDTO userDto = userGroupService.getGroupUserInfo(topicDto.getGroupId(), userId, GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
+        int[] states = {GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()};
+        UserGroupDTO userDto = userGroupService.getGroupUserInfo(topicDto.getGroupId(), userId, states);
         if (null == userDto || !NumConstant.ONE_STR.equals(userDto.getLordFlag())) {
             return new Result().error("您不是群主，不可以转为议题");
         }

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

@@ -70,7 +70,11 @@
     </update>
 
     <select id="selectOnOfUserInfo" resultType="com.elink.esua.epdc.dto.group.UserGroupDTO">
-        SELECT * FROM epdc_user_group WHERE DEL_FLAG = '0' AND GROUP_ID = #{groupId} AND USER_ID = #{userId} AND STATE = #{state}
+        SELECT * FROM epdc_user_group WHERE DEL_FLAG = '0' AND GROUP_ID = #{groupId} AND USER_ID = #{userId}
+        AND STATE in
+        <foreach item="state" collection="states" open="(" separator="," close=")">
+            #{state}
+        </foreach>
     </select>
 
     <select id="selectListOfGroupUserIdsByState" resultType="string">