Bladeren bron

fix 修改没数据时row为null

Administrator 4 jaren geleden
bovenliggende
commit
2d6aaee968

+ 2 - 2
boman-modules/boman-system/src/main/java/com/boman/system/mapper/BomanGroupUserMapper.java

@@ -34,8 +34,8 @@ public interface BomanGroupUserMapper
 
 
     /**
     /**
      * 给组新增用户
      * 给组新增用户
-     * @param bomanGroupUser
+     * @param bomanGroupUserList
      * @return
      * @return
      */
      */
-    public int insertUserGroup(BomanGroupUser bomanGroupUser);
+    public int insertUserGroup(@Param("bomanGroupUserList") List<BomanGroupUser> bomanGroupUserList);
 }
 }

+ 9 - 3
boman-modules/boman-system/src/main/java/com/boman/system/service/impl/BomanGroupServiceImpl.java

@@ -1,6 +1,7 @@
 package com.boman.system.service.impl;
 package com.boman.system.service.impl;
 
 
 import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.exception.CustomException;
+import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
@@ -135,18 +136,21 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
         list.removeIf(longs::contains
         list.removeIf(longs::contains
         );
         );
         if (list.size() > 0){
         if (list.size() > 0){
+            List<BomanGroupUser> bomanGroupUserList = new ArrayList<>();
             for (Long userId : list) {
             for (Long userId : list) {
                 BomanGroupUser bomanGroupUser = new BomanGroupUser();
                 BomanGroupUser bomanGroupUser = new BomanGroupUser();
                 bomanGroupUser.setUserId(userId);
                 bomanGroupUser.setUserId(userId);
                 bomanGroupUser.setGroupId(groupId);
                 bomanGroupUser.setGroupId(groupId);
+                bomanGroupUser.setCreateBy(SecurityUtils.getUsername());
                 SysUser user = sysUserMapper.selectUserById(userId);
                 SysUser user = sysUserMapper.selectUserById(userId);
                 if (user != null){
                 if (user != null){
                     bomanGroupUser.setUserName(user.getUserName());
                     bomanGroupUser.setUserName(user.getUserName());
-                    groupUserMapper.insertUserGroup(bomanGroupUser);
+                    bomanGroupUserList.add(bomanGroupUser);
                 }else {
                 }else {
                     return AjaxResult.error("该用户不存在");
                     return AjaxResult.error("该用户不存在");
                 }
                 }
             }
             }
+            groupUserMapper.insertUserGroup(bomanGroupUserList);
         }
         }
         return AjaxResult.success();
         return AjaxResult.success();
     }
     }
@@ -173,8 +177,10 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
     public List<SysUser> selectUserByGroupId(Long groupId) {
     public List<SysUser> selectUserByGroupId(Long groupId) {
         //所有组对应的用户id
         //所有组对应的用户id
         List<Long> userIds = groupUserMapper.selectGroupUserList(groupId);
         List<Long> userIds = groupUserMapper.selectGroupUserList(groupId);
-        List<SysUser> sysUsers = sysUserMapper.selectUserByUserIds(userIds);
-
+        List<SysUser> sysUsers = new ArrayList<>();
+        if (userIds.size() > 0){
+            sysUsers = sysUserMapper.selectUserByUserIds(userIds);
+        }
         return sysUsers;
         return sysUsers;
     }
     }
 
 

+ 14 - 10
boman-modules/boman-system/src/main/resources/mapper/system/BomanGroupUserMapper.xml

@@ -46,15 +46,19 @@
         <if test="isDel != null and isDel != ''">is_del,</if>
         <if test="isDel != null and isDel != ''">is_del,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         create_time
-        )values(
-        <if test="id != null and id != 0">#{id},</if>
-        <if test="useId != null">#{useId},</if>
-        <if test="userName != null and userName != ''">#{userName},</if>
-        <if test="groupId != null">#{groupId},</if>
-        <if test="status != null and status != ''">#{status},</if>
-        <if test="isDel != null and isDel != ''">#{isDel},</if>
-        <if test="createBy != null and createBy != ''">#{createBy},</if>
-        sysdate()
-        )
+        )values
+        <foreach collection ="bomanGroupUserList" item="bomanGroupUser" index= "index" separator =",">
+         (
+            <if test="bomanGroupUser.id != null and bomanGroupUser.id != 0">#{bomanGroupUser.id},</if>
+            <if test="bomanGroupUser.useId != null">#{bomanGroupUser.useId},</if>
+            <if test="bomanGroupUser.userName != null and bomanGroupUser.userName != ''">#{bomanGroupUser.userName},</if>
+            <if test="bomanGroupUser.groupId != null">#{bomanGroupUser.groupId},</if>
+            <if test="bomanGroupUser.status != null and bomanGroupUser.status != ''">#{bomanGroupUser.status},</if>
+            <if test="bomanGroupUser.isDel != null and bomanGroupUser.isDel != ''">#{bomanGroupUser.isDel},</if>
+            <if test="bomanGroupUser.createBy != null and bomanGroupUser.createBy != ''">#{bomanGroupUser.createBy},</if>
+            sysdate()
+                         )
+        </foreach >
+
     </insert>
     </insert>
 </mapper> 
 </mapper> 

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/controller/CommonController.java

@@ -95,7 +95,7 @@ public class CommonController {
      * @param dto dto
      * @param dto dto
      * @return int
      * @return int
      */
      */
-    @PostMapping("insertList")
+    @PostMapping("/insertList")
     public int insertList(@RequestBody InsertListDto dto) {
     public int insertList(@RequestBody InsertListDto dto) {
         return commonService.insertList(dto);
         return commonService.insertList(dto);
     }
     }