Merge remote-tracking branch 'origin/master'

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

@@ -100,12 +100,12 @@ public class SysUserController extends BaseController
      * @param user
      */
     @GetMapping("/applyFor")
-    public AjaxResult applyFor(Long id)
+    public AjaxResult applyFor(Long id,Long deptId)
     {
         //获取部门负责人信息
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //修改被申请人信息
-        return userService.updateApplyFor(user,id);
+        return userService.updateApplyFor(user,id,deptId);
     }
 
     /*** 废弃
@@ -389,7 +389,7 @@ public class SysUserController extends BaseController
     public AjaxResult deptTreeNow()
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        return success(deptService.selectDeptTreeList(user.getDept()));
+        return success(deptService.selectDeptTreeNowList(user.getDept()));
     }
 
     /***

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

@@ -115,4 +115,6 @@ public interface SysDeptMapper
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    List<SysDept> selectDeptTreeNowList(SysDept dept);
 }

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

@@ -121,4 +121,6 @@ public interface ISysDeptService
      * @return 结果
      */
     public int deleteDeptById(Long deptId);
+
+    List<TreeSelect> selectDeptTreeNowList(SysDept dept);
 }

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

@@ -244,7 +244,7 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
 
-    AjaxResult updateApplyFor(SysUser user, Long id);
+    AjaxResult updateApplyFor(SysUser user, Long id,Long deptId);
 
     AjaxResult reply(String status,Long id);
 

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

@@ -293,6 +293,12 @@ public class SysDeptServiceImpl implements ISysDeptService
         return deptMapper.deleteDeptById(deptId);
     }
 
+    @Override
+    public List<TreeSelect> selectDeptTreeNowList(SysDept dept) {
+        List<SysDept> depts = deptMapper.selectDeptTreeNowList(dept);
+        return buildDeptTreeSelect(depts);
+    }
+
     /**
      * 递归列表
      */

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

@@ -596,29 +596,30 @@ public class SysUserServiceImpl implements ISysUserService
 
 
     @Override
-    public AjaxResult updateApplyFor(SysUser user, Long id) {
+    public AjaxResult updateApplyFor(SysUser user, Long id, Long deptId) {
+        //查询dept信息
+        SysDept dept = deptMapper.selectDeptById(deptId);
 
         SysUser applyForUser = new SysUser();
         applyForUser.setUserId(id);
-        //applyForUser.setDeptId(user.getDeptId());
         applyForUser.setApplyFor("0");
         userMapper.updateUser(applyForUser);
 
         //将消息保存进消息记录表
         SysUser users = userMapper.selectUserById(id);
-        SysDept dept = user.getDept();
+        //SysDept dept = user.getDept();
         RecordInfo recordInfo = new RecordInfo();
         recordInfo.setTitle("部门申请");
         StringBuilder sb = new StringBuilder();
         sb.append(user.getNickName()).append("邀请您加入").append(dept.getDeptName());
         recordInfo.setContent(sb.toString());
-        recordInfo.setDeptId(user.getDeptId());
-        recordInfo.setDeptName(user.getDept().getDeptName());
+        recordInfo.setDeptId(deptId);
+        recordInfo.setDeptName(dept.getDeptName());
         //寻找最上级部门
-        if("0".equals(user.getDept().getAncestors())){
-            recordInfo.setTopDept(user.getDept().getDeptName());
+        if("0".equals(dept.getAncestors())){
+            recordInfo.setTopDept(dept.getDeptName());
         }else{
-            List<String> strList = Arrays.asList(user.getDept().getAncestors().split(","));
+            List<String> strList = Arrays.asList(dept.getAncestors().split(","));
             Long topDeptId = Long.valueOf(strList.get(1));
             SysDept sysDeptA = deptMapper.selectDeptById(topDeptId);
             recordInfo.setTopDept(sysDeptA.getDeptName());

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

@@ -156,4 +156,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+	<select id="selectDeptTreeNowList" parameterType="SysDept" resultMap="SysDeptResult">
+		<include refid="selectDeptVo"/>
+		where d.del_flag = '0'
+		<if test="deptId != null and deptId != 0">
+			AND (dept_id = #{deptId} or ancestors like concat('%', #{deptId}, '%')
+		</if>
+		<if test="parentId != null and parentId != 0">
+			AND parent_id = #{parentId}
+		</if>
+		<if test="status != null and status != ''">
+			AND status = #{status}
+		</if>
+		<!-- 数据范围过滤 -->
+		${params.dataScope}
+		order by d.parent_id, d.order_num
+	</select>
+
 </mapper>