党群管理数接口调整

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/OtherUsers.java → esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/result/AllUsers.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @create 2020-06-05
  */
 @Data
-public class OtherUsers implements Serializable {
+public class AllUsers implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -40,7 +40,7 @@ public class PartyUserGroupResultDTO implements Serializable {
     /**
      * 其他成员
      */
-    List<OtherUsers> otherUsers;
+    List<AllUsers> otherUsers;
 
 
 }

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/dao/PartyUserGroupDao.java

@@ -20,8 +20,8 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.PartyUserGroupDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
+import com.elink.esua.epdc.dto.result.AllUsers;
 import com.elink.esua.epdc.dto.result.CurrentUser;
-import com.elink.esua.epdc.dto.result.OtherUsers;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -61,13 +61,13 @@ public interface PartyUserGroupDao extends BaseDao<PartyUserGroupEntity> {
      **/
     List<PartyUserGroupDTO> getPartyUserGroupPageFromPC(Map<String, Object> params);
     /**
-     * @Description  APP获取其他群成员
+     * @Description  APP获取所有群成员
      * @Author songyunpeng
      * @Date  2020/6/3
      * @Param [formDTO]
      * @return java.util.List<com.elink.esua.epdc.dto.result.CurrentUser>
      **/
-    List<OtherUsers> selectListOfPartyUserGroupWithoutCurrentUser(PartyUserGroupFormDTO formDTO);
+    List<AllUsers> selectListOfPartyUserGroupWithoutCurrentUser(PartyUserGroupFormDTO formDTO);
 
     /**
      * @Description  APP获取当前用户的成员信息

esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/service/impl/PartyUserGroupServiceImpl.java

@@ -35,8 +35,8 @@ import com.elink.esua.epdc.dto.constant.PartyGroupConstant;
 import com.elink.esua.epdc.dto.form.PartyUserBannedFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserGroupFormDTO;
 import com.elink.esua.epdc.dto.form.PartyUserIdentityFormDTO;
+import com.elink.esua.epdc.dto.result.AllUsers;
 import com.elink.esua.epdc.dto.result.CurrentUser;
-import com.elink.esua.epdc.dto.result.OtherUsers;
 import com.elink.esua.epdc.dto.result.PartyUserGroupResultDTO;
 import com.elink.esua.epdc.entity.PartyUserGroupEntity;
 import com.elink.esua.epdc.enums.BannedEnum;
@@ -174,11 +174,11 @@ public class PartyUserGroupServiceImpl extends BaseServiceImpl<PartyUserGroupDao
     public Result<PartyUserGroupResultDTO> getAllPartyUser(PartyUserGroupFormDTO formDTO) {
         int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
         formDTO.setPageIndex(pageIndex);
-        List<OtherUsers> otherUsers = baseDao.selectListOfPartyUserGroupWithoutCurrentUser(formDTO);
+        List<AllUsers> allUsers = baseDao.selectListOfPartyUserGroupWithoutCurrentUser(formDTO);
         CurrentUser currentUser = baseDao.selectOneOfPartyUserGroup(formDTO);
         PartyUserGroupResultDTO partyUserGroupResultDTO = new PartyUserGroupResultDTO();
         partyUserGroupResultDTO.setCurrentUser(currentUser);
-        partyUserGroupResultDTO.setOtherUsers(otherUsers);
+        partyUserGroupResultDTO.setOtherUsers(allUsers);
         return new Result<PartyUserGroupResultDTO>().ok(partyUserGroupResultDTO);
     }
 

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

@@ -143,7 +143,7 @@
          order by CREATED_TIME desc
     </select>
 
-    <select id="selectListOfPartyUserGroupWithoutCurrentUser" resultType="com.elink.esua.epdc.dto.result.OtherUsers">
+    <select id="selectListOfPartyUserGroupWithoutCurrentUser" resultType="com.elink.esua.epdc.dto.result.AllUsers">
         select
         ID,
         USER_ID,
@@ -183,7 +183,7 @@
         ALL_DEPT_IDS,
         GRID,DATEDIFF(BANNED_END_TIME,BANNED_START_TIME) as bannedTime from epdc_party_user_group)a
         where DEL_FLAG='0'
-       and   PARTY_GROUP_ID = #{partyGroupId} and USER_ID != #{userId}
+       and   PARTY_GROUP_ID = #{partyGroupId}
         order by IDENTITY_FLAG,CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>