zhoupeng 2 years ago
parent
commit
834fc41bb2

+ 2 - 2
chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/UserGroupDao.java

@@ -13,7 +13,7 @@ public interface UserGroupDao {
 
 
     UserGroup getUserGroupById(Integer id);
     UserGroup getUserGroupById(Integer id);
 
 
-    List<UserGroupUser> getUserGroupUserById(Integer userGroupId);
+    List<String> getUserGroupUserById(Integer userGroupId);
 
 
     Integer delUserGroupUserListById(Integer userGroupId);
     Integer delUserGroupUserListById(Integer userGroupId);
 
 
@@ -21,7 +21,7 @@ public interface UserGroupDao {
 
 
     Integer addUserGroup(UserGroup userGroup);
     Integer addUserGroup(UserGroup userGroup);
 
 
-    Integer addUserGroupUserList(Integer userGroupId, List<UserGroupUser> userGroupUserList);
+    Integer addUserGroupUserList(Integer userGroupId, List<String> userIdList);
 
 
     UserGroup getUserGroupByNameNoId(Integer id, String userId, String userGroupName);
     UserGroup getUserGroupByNameNoId(Integer id, String userId, String userGroupName);
 
 

+ 1 - 1
chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/UserGroup.java

@@ -39,6 +39,6 @@ public class UserGroup implements Serializable {
      */
      */
     private Date createTime;
     private Date createTime;
 
 
-    private List<UserGroupUser> userGroupUserList;
+    private List<String> userIdList;
 
 
 }
 }

+ 6 - 6
chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserGroupServiceImpl.java

@@ -40,8 +40,8 @@ public class UserGroupServiceImpl implements UserGroupService {
         if (userGroupDao.addUserGroup(userGroup) <= 0) {
         if (userGroupDao.addUserGroup(userGroup) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增用户组失败");
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增用户组失败");
         }
         }
-        if (Blank.isNotEmpty(userGroup.getUserGroupUserList())) {
-            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserGroupUserList());
+        if (Blank.isNotEmpty(userGroup.getUserIdList())) {
+            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserIdList());
         }
         }
         return Result.ok("新增用户组成功");
         return Result.ok("新增用户组成功");
     }
     }
@@ -58,8 +58,8 @@ public class UserGroupServiceImpl implements UserGroupService {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改用户组失败");
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改用户组失败");
         }
         }
         userGroupDao.delUserGroupUserListById(userGroup.getId());
         userGroupDao.delUserGroupUserListById(userGroup.getId());
-        if (Blank.isNotEmpty(userGroup.getUserGroupUserList())) {
-            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserGroupUserList());
+        if (Blank.isNotEmpty(userGroup.getUserIdList())) {
+            userGroupDao.addUserGroupUserList(userGroup.getId(), userGroup.getUserIdList());
         }
         }
         return Result.ok("修改用户组成功");
         return Result.ok("修改用户组成功");
     }
     }
@@ -67,8 +67,8 @@ public class UserGroupServiceImpl implements UserGroupService {
     @Override
     @Override
     public Result getUserGroupById(Integer id) {
     public Result getUserGroupById(Integer id) {
         UserGroup userGroup = userGroupDao.getUserGroupById(id);
         UserGroup userGroup = userGroupDao.getUserGroupById(id);
-        List<UserGroupUser> userGroupUserList = userGroupDao.getUserGroupUserById(id);
-        userGroup.setUserGroupUserList(userGroupUserList);
+        List<String> userIdList = userGroupDao.getUserGroupUserById(id);
+        userGroup.setUserIdList(userIdList);
         return Result.ok(userGroup);
         return Result.ok(userGroup);
     }
     }
 
 

+ 7 - 9
chuanyi_server/src/main/resources/mapper/UserGroupDao.xml

@@ -19,8 +19,8 @@
 
 
     <insert id="addUserGroupUserList">
     <insert id="addUserGroupUserList">
         insert into t_user_group_user (user_group_id, user_id) VALUES
         insert into t_user_group_user (user_group_id, user_id) VALUES
-        <foreach collection="userGroupUserList" item="userGroupUser" index="index" separator=",">
-            (#{userGroupId},#{userGroupUser.userId})
+        <foreach collection="userIdList" item="userId" index="index" separator=",">
+            (#{userGroupId},#{userId})
         </foreach>
         </foreach>
     </insert>
     </insert>
 
 
@@ -46,13 +46,6 @@
         where id=#{id}
         where id=#{id}
     </select>
     </select>
 
 
-    <select id="getUserGroupUserById" resultType="com.judong.chuanyiserver.entity.UserGroupUser">
-        select
-        <include refid="userGroupUser"/>
-        from t_user_group_user
-        where user_group_id = #{userGroupId}
-    </select>
-
     <select id="getUserGroupByNameNoId" resultType="com.judong.chuanyiserver.entity.UserGroup">
     <select id="getUserGroupByNameNoId" resultType="com.judong.chuanyiserver.entity.UserGroup">
         select
         select
         <include refid="userGroup"/>
         <include refid="userGroup"/>
@@ -68,6 +61,11 @@
         from t_user_group_user
         from t_user_group_user
         where user_id=#{userId}
         where user_id=#{userId}
     </select>
     </select>
+    <select id="getUserGroupUserById" resultType="java.lang.String">
+        select user_id
+        from t_user_group_user
+        where user_group_id = #{userGroupId}
+    </select>
 
 
     <delete id="delUserGroupUserListById">
     <delete id="delUserGroupUserListById">
         delete
         delete