lbqms.git - Gitblit

			@@ -15,6 +15,7 @@
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.helper.DataBaseHelper;
			import com.ruoyi.common.helper.LoginHelper;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.domain.SysPost;
			@@ -80,10 +81,10 @@
			.and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
			List<SysDept> deptList = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
			.select(SysDept::getDeptId)
			.apply("find_in_set({0},ancestors)", user.getDeptId()));
			w.eq("u.dept_id", user.getDeptId())
			.or()
			.in("u.dept_id", deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList()));
			.apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors")));
			List<Long> ids = deptList.stream().map(SysDept::getDeptId).collect(Collectors.toList());
			ids.add(user.getDeptId());
			w.in("u.dept_id", ids);
			});
			return wrapper;
			}
			@@ -114,7 +115,7 @@
			*/
			@Override
			public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
			Long userId = userRoleMapper.selectUserIdByRoleId(user.getRoleId());
			List<Long> userId = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
			QueryWrapper<SysUser> wrapper = Wrappers.query();
			wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
			.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
			@@ -137,6 +138,17 @@
			}

			/**
			* 通过手机号查询用户
			*
			* @param phonenumber 手机号
			* @return 用户对象信息
			*/
			@Override
			public SysUser selectUserByPhonenumber(String phonenumber) {
			return baseMapper.selectUserByPhonenumber(phonenumber);
			}

			/**
			* 通过用户ID查询用户
			*
			* @param userId 用户ID