部门邀请人员、消息记录修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -129,4 +129,9 @@ public class SysDeptController extends BaseController
         deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }
+
+    /**
+     * 获取当前账号的下拉部门树
+     */
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -63,17 +63,29 @@ public class SysUserController extends BaseController
         return getDataTable(list);
     }
 
+
+    /**
+     * 获取用户列表（获取本部门及以下人员）
+     */
+    @GetMapping("/subordinateList")
+    public TableDataInfo subordinateList(SysUser user)
+    {
+        startPage();
+        SysUser users = SecurityUtils.getLoginUser().getUser();
+        user.setDeptId(users.getDeptId());
+        List<SysUser> list = userService.selectUserList(user);
+        return getDataTable(list);
+    }
+
     /***
-     * 获取没有分配部门的人员
+     * 获取没有分配部门的人员(只能通过手机号查询)
      * @param user
      * @return
      */
-    @GetMapping("/allocationList")
-    public TableDataInfo allocationList(SysUser user)
+    @GetMapping("/allocationOne")
+    public AjaxResult allocationOne(String phonenumber)
     {
-        startPage();
-        List<SysUser> list = userService.allocationList(user);
-        return getDataTable(list);
+        return userService.allocationOne(phonenumber);
     }
 
     /***
@@ -337,4 +349,15 @@ public class SysUserController extends BaseController
     {
         return success(deptService.selectDeptTreeList(dept));
     }
+
+    /**
+     * 获取当前账号部门树列表
+     */
+    @GetMapping("/deptTreeNow")
+    public AjaxResult deptTreeNow()
+    {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        return success(deptService.selectDeptTreeList(user.getDept()));
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -133,4 +133,6 @@ public interface SysUserMapper
     public SysUser checkEmailUnique(String email);
 
     List<SysUser> allocationList(SysUser user);
+
+    SysUser selectUserByPhonenumber(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -214,11 +214,12 @@ public interface ISysUserService
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
-    List<SysUser> allocationList(SysUser user);
 
     AjaxResult updateApplyFor(SysUser user, Long id);
 
     AjaxResult reply(String status);
 
     AjaxResult query(SysUser user);
+
+    AjaxResult allocationOne(String phonenumber);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -559,10 +559,6 @@ public class SysUserServiceImpl implements ISysUserService
         return successMsg.toString();
     }
 
-    @Override
-    public List<SysUser> allocationList(SysUser user) {
-        return userMapper.allocationList(user);
-    }
 
     @Override
     public AjaxResult updateApplyFor(SysUser user, Long id) {
@@ -634,4 +630,16 @@ public class SysUserServiceImpl implements ISysUserService
         map.put("status","1");
         return AjaxResult.success(map);
     }
+
+    @Override
+    public AjaxResult allocationOne(String phonenumber) {
+        if(StringUtils.isEmpty(phonenumber)){
+            return AjaxResult.error("手机号不能为空");
+        }
+        SysUser applyForUser = userMapper.selectUserByPhonenumber(phonenumber);
+        if (applyForUser!=null){
+            return AjaxResult.success("操作成功",applyForUser);
+        }
+        return AjaxResult.success("该人员不存在或该人员已分配部门");
+    }
 }

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -252,5 +252,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
+
+	<select id="selectUserByPhonenumber" parameterType="Long" resultMap="SysUserResult">
+		<include refid="selectUserVo"/>
+		where u.phonenumber = #{phonenumber}
+		and u.del_flag = '0'
+		and (u.dept_id = 0 or u.dept_id is null)
+		limit 1
+	</select>
 	
 </mapper>