From 7f71993050a4a33031ede85eb88c2aba62dc088a Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Sat, 23 Dec 2023 14:47:25 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 8100fa0..9e26b0f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -9,9 +9,11 @@
import javax.annotation.Resource;
import javax.validation.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
@@ -136,14 +138,16 @@
public List<SysUser> selectUserList(SysUser user) {
return userMapper.selectUserList(user);
}
+ /**
+ * 获取App单兵和指挥端用户列表
+ *
+ * @param user APP用户信息
+ * @return 用户信息集合信息
+ */
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
- public List<SysUser> selectAppUserList(SysUser user) {
- return userMapper.selectAppUserList(user);
- }
- @Override
- public List<SysUser> selectAppUserListNoDataScope(SysUser user) {
- return userMapper.selectAppUserList(user);
+// @DataScope(deptAlias = "d", userAlias = "u")
+ public List<SysUser> selectAllAppUserList(SysUser user) {
+ return userMapper.selectAllAppUserList(user);
}
/**
* 根据条件分页查询已分配用户角色列表
@@ -309,6 +313,7 @@
public int insertUser(SysUser user) {
// 新增用户信息
+ user.setUserId(IdUtils.simpleUUID());
int rows = userMapper.insertUser(user);
if (rows > 0) { //增加用户缓存
redisCache.setCacheObject(getCacheKey(user.getUserId()), user);
@@ -627,4 +632,19 @@
private String getCacheKey(String configKey) {
return CacheConstants.USER_LIST_KEY + configKey;
}
+
+
+ @Override
+ public List<SysUser> userByDeptList(List<Long> deptList) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("dept_id",deptList);
+ return userMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public List<SysUser> userByDept(Long deptId) {
+ QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("dept_id",deptId).eq("del_flag","0").eq("app_user_type","1");
+ return userMapper.selectList(queryWrapper);
+ }
}
--
Gitblit v1.9.3