Merge remote-tracking branch 'origin/master'

boman-modules/boman-system/src/main/java/com/boman/system/controller/BomanGroupController.java

@@ -98,7 +98,7 @@ public class BomanGroupController extends BaseController
     }
 
     /**
-     * 给组添加用户
+     * 给组添加用户/修改组中的用户
      * @param groupId
      * @param userIds
      * @return
@@ -115,7 +115,7 @@ public class BomanGroupController extends BaseController
      * @return
      */
     @GetMapping("/deleteGroupUser/{groupId}/{userIds}")
-    public AjaxResult deleteGroupUser(@PathVariable Long groupId,@PathVariable Long[] userIds){
+    public AjaxResult deleteGroupUser(@PathVariable Long groupId,@PathVariable long[] userIds){
         return bomanGroupService.deleteGroupUser(groupId,userIds);
     }
 

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -39,7 +39,7 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysRoleService roleService;
 
-    @PreAuthorize(hasPermi = "system:role:list")
+    //@PreAuthorize(hasPermi = "system:role:list")
     @GetMapping("/list")
     public TableDataInfo list(SysRole role)
     {
@@ -49,7 +49,7 @@ public class SysRoleController extends BaseController
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
-    @PreAuthorize(hasPermi = "system:role:export")
+    //@PreAuthorize(hasPermi = "system:role:export")
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysRole role) throws IOException
     {
@@ -61,7 +61,7 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色编号获取详细信息
      */
-    @PreAuthorize(hasPermi = "system:role:query")
+    //@PreAuthorize(hasPermi = "system:role:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable Long id)
     {
@@ -72,7 +72,7 @@ public class SysRoleController extends BaseController
     /**
      * 根据角色编号获取对应角色用户的用户id,用户名,部门名称,角色名
      */
-    @PreAuthorize(hasPermi = "system:role:user")
+    //@PreAuthorize(hasPermi = "system:role:user")
     @GetMapping(value = "/user/{id}")
     public AjaxResult getUserInfo(@PathVariable Long id)
     {
@@ -83,7 +83,7 @@ public class SysRoleController extends BaseController
     /**
      * 新增角色
      */
-    @PreAuthorize(hasPermi = "system:role:add")
+    //@PreAuthorize(hasPermi = "system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysRole role)
@@ -104,7 +104,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存角色
      */
-    @PreAuthorize(hasPermi = "system:role:edit")
+    //@PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role)
@@ -125,7 +125,7 @@ public class SysRoleController extends BaseController
     /**
      * 修改保存数据权限
      */
-    @PreAuthorize(hasPermi = "system:role:edit")
+    //@PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
     public AjaxResult dataScope(@RequestBody SysRole role)
@@ -137,7 +137,7 @@ public class SysRoleController extends BaseController
     /**
      * 状态修改
      */
-    @PreAuthorize(hasPermi = "system:role:edit")
+    //@PreAuthorize(hasPermi = "system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role)
@@ -150,7 +150,7 @@ public class SysRoleController extends BaseController
     /**
      * 删除角色
      */
-    @PreAuthorize(hasPermi = "system:role:remove")
+    //@PreAuthorize(hasPermi = "system:role:remove")
     @Log(title = "角色管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -161,7 +161,7 @@ public class SysRoleController extends BaseController
     /**
      * 获取角色选择框列表
      */
-    @PreAuthorize(hasPermi = "system:role:query")
+    //@PreAuthorize(hasPermi = "system:role:query")
     @GetMapping("/optionselect")
     public AjaxResult optionselect()
     {

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

@@ -30,7 +30,7 @@ public interface BomanGroupUserMapper
      * @param userIds
      * @return
      */
-    public int deleteGroupUser( @Param("groupId") Long groupId, @Param("userIds") Long[] userIds);
+    public int deleteGroupUser( @Param("groupId") Long groupId, @Param("userIds") long[] userIds);
 
     /**
      * 给组新增用户

boman-modules/boman-system/src/main/java/com/boman/system/service/IBomanGroupService.java

@@ -86,7 +86,7 @@ public interface IBomanGroupService
      * @param userIds
      * @return
      */
-    public AjaxResult deleteGroupUser(Long groupId, Long[] userIds);
+    public AjaxResult deleteGroupUser(Long groupId, long[] userIds);
 
     /**
      * 根据组织编号获取对应组织所有用户

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

@@ -1,5 +1,6 @@
 package com.boman.system.service.impl;
 
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
@@ -13,13 +14,12 @@ import com.boman.system.domain.vo.TreeSelect;
 import com.boman.system.mapper.*;
 import com.boman.system.service.IBomanGroupService;
 import com.google.common.collect.Lists;
+import org.apache.poi.ss.formula.functions.T;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -123,34 +123,60 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
     }
 
 
-    /**给组添加用户
+    /**
+     * 给组添加用户
+     *
      * @param groupId
      * @param userIds
      * @return
      */
     @Override
     public AjaxResult insertUserGroup(Long groupId, Long[] userIds) {
-        //查询改组所有用户
+        //查询该组所有用户
         List<Long> list = groupUserMapper.selectGroupUserList(groupId);
+        List<BomanGroupUser> bomanGroupUserList = new ArrayList<>();
         List<Long> longs = Arrays.asList(userIds);
-        list.removeIf(longs::contains
-        );
-        if (list.size() > 0){
-            List<BomanGroupUser> bomanGroupUserList = new ArrayList<>();
-            for (Long userId : list) {
+        if (list.size() > 0) {
+            //需要删除的
+            List<Object> objectDelete = Arrays.asList(CollectionUtils.subtract(list, longs).toArray());
+            if (objectDelete.size() > 0){
+                List<Long> objectDeleteIds = new ArrayList<>();
+                for (Object o : objectDelete) {
+                    objectDeleteIds.add(Long.valueOf(o.toString()));
+                }
+                groupUserMapper.deleteGroupUser(groupId,objectDeleteIds.stream().mapToLong(Long::valueOf).toArray());
+            }
+            //是否有新增的
+            List<Object> objects = Arrays.asList(CollectionUtils.subtract(longs, list).toArray());
+            if (objects.size() > 0) {
+                for (Object userId : objects) {
+                    BomanGroupUser bomanGroupUser = new BomanGroupUser();
+                    bomanGroupUser.setUserId(Long.valueOf(userId.toString()));
+                    bomanGroupUser.setGroupId(groupId);
+                    bomanGroupUser.setCreateBy(SecurityUtils.getUsername());
+                    SysUser user = sysUserMapper.selectUserById(Long.valueOf(userId.toString()));
+                    if (user != null) {
+                        bomanGroupUser.setUserName(user.getUserName());
+                        bomanGroupUserList.add(bomanGroupUser);
+                    } else {
+                        return AjaxResult.error("该用户不存在");
+                    }
+                }
+                groupUserMapper.insertUserGroup(bomanGroupUserList);
+            }
+        } else {
+            for (Long userId : longs) {
                 BomanGroupUser bomanGroupUser = new BomanGroupUser();
                 bomanGroupUser.setUserId(userId);
                 bomanGroupUser.setGroupId(groupId);
                 bomanGroupUser.setCreateBy(SecurityUtils.getUsername());
                 SysUser user = sysUserMapper.selectUserById(userId);
-                if (user != null){
+                if (user != null) {
                     bomanGroupUser.setUserName(user.getUserName());
                     bomanGroupUserList.add(bomanGroupUser);
-                }else {
-                    return AjaxResult.error("该用户不存在");
+                    groupUserMapper.insertUserGroup(bomanGroupUserList);
                 }
             }
-            groupUserMapper.insertUserGroup(bomanGroupUserList);
         }
         return AjaxResult.success();
     }
@@ -158,18 +184,20 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
 
     /**
      * 给组删除用户
+     *
      * @param groupId
      * @param userIds
      * @return
      */
     @Override
-    public AjaxResult deleteGroupUser(Long groupId, Long[] userIds) {
-        groupUserMapper.deleteGroupUser(groupId,userIds);
+    public AjaxResult deleteGroupUser(Long groupId, long[] userIds) {
+        groupUserMapper.deleteGroupUser(groupId, userIds);
         return AjaxResult.success();
     }
 
     /**
      * 根据组织编号获取对应组织所有用户
+     *
      * @param groupId
      * @return
      */
@@ -178,7 +206,7 @@ public class BomanGroupServiceImpl implements IBomanGroupService {
         //所有组对应的用户id
         List<Long> userIds = groupUserMapper.selectGroupUserList(groupId);
         List<SysUser> sysUsers = new ArrayList<>();
-        if (userIds.size() > 0){
+        if (userIds.size() > 0) {
             sysUsers = sysUserMapper.selectUserByUserIds(userIds);
         }
         return sysUsers;

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

@@ -38,23 +38,17 @@
 
     <insert id="insertUserGroup" parameterType="com.boman.domain.BomanGroupUser">
         insert into boman_group_user(
-        <if test="id != null and id != 0">id,</if>
-        <if test="useId != null">user_id,</if>
-        <if test="userName != null and userName != ''">user_name,</if>
-        <if test="groupId != null">group_id,</if>
-        <if test="status != null and status != ''">status,</if>
-        <if test="isDel != null and isDel != ''">is_del,</if>
-        <if test="createBy != null and createBy != ''">create_by,</if>
+        user_id,
+        user_name,
+        group_id,
+        create_by,
         create_time
         )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.userId != null">#{bomanGroupUser.userId},</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()
                          )

boman-modules/boman-system/src/main/resources/rebel.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
--->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
-
-	<id>boman-modules-system</id>
-
-	<classpath>
-		<dir name="E:/jiaoyuju/boman-modules/boman-system/target/classes">
-		</dir>
-	</classpath>
-
-</application>