From 1a9153391a21cc6c5cccb930024b13bd8fa0c6ed Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 15:24:57 +0800
Subject: [PATCH] 根据角色编码查询用户id集合根据角色编码查询用户id集合

---
 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml                                    |   11 ++++++-----
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java                  |   17 ++++++++++++++---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java         |    2 ++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java |    8 ++++++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java            |    6 ++++++
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml         |   11 +++++++++++
 6 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
index 8eeb992..874890b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentUnsealController.java
@@ -12,6 +12,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -19,8 +26,12 @@
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.eam.entity.Equipment;
 import org.jeecg.modules.eam.entity.EquipmentUnsealDetail;
 import org.jeecg.modules.eam.entity.EquipmentUnseal;
+import org.jeecg.modules.eam.service.IEamEquipmentService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealDetailService;
+import org.jeecg.modules.eam.service.IEquipmentUnsealService;
 import org.jeecg.modules.eam.vo.EquipmentUnsealPage;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -74,9 +85,9 @@
 	@ApiOperation(value="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ", notes="璁惧鍚皝-鍒嗛〉鍒楄〃鏌ヨ")
 	@GetMapping(value = "/list")
 	public Result<IPage<EquipmentUnseal>> queryPageList(EquipmentUnseal equipmentUnseal,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
 		//QueryWrapper<EquipmentUnseal> queryWrapper = QueryGenerator.initQueryWrapper(equipmentUnseal, req.getParameterMap());
 		//Page<EquipmentUnseal> page = new Page<EquipmentUnseal>(pageNo, pageSize);
 		QueryWrapper<EquipmentUnseal> queryWrapper = new QueryWrapper<>();
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
index f146b04..cb3734c 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
@@ -172,4 +172,10 @@
 	 */
 	List<SysUser> getAllUsersByRoleId(@Param("roleId") String roleId);
 
+
+
+	/**
+	 * 鏍规嵁瑙掕壊缂栫爜鏌ヨ鐢ㄦ埛id闆嗗悎
+	 */
+	List<String> getUserByRoleCode(@Param("roleCode") String roleCode);
 }
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
index 3a100ad..feef5b8 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
@@ -195,4 +195,15 @@
 	<select id="getAllUsersByRoleId" resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from sys_user where del_flag = '0' and id in (select user_id from sys_user_role where role_id=#{roleId})
 	</select>
+	<!--鏍规嵁瑙掕壊缂栫爜鏌ヨ鐢ㄦ埛id闆嗗悎鏍规嵁瑙掕壊缂栫爜鏌ヨ鐢ㄦ埛id闆嗗悎-->
+	<select id="getUserByRoleCode" resultType="java.lang.String">
+		SELECT
+			su.id
+		FROM
+			sys_user su
+				LEFT JOIN sys_user_role sur ON su.id = sur.user_id
+				LEFT JOIN sys_role sr ON sur.role_id = sr.id
+		WHERE
+			sr.role_code = #{ roleCode }
+	</select>
 </mapper>
\ No newline at end of file
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 76ad818..0a4567f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -316,4 +316,6 @@
 	 * @return
 	 */
 	public List<SysUser> getAllUsersByRoleId(String roleId);
+
+	List<String> getUserByRoleCode(String roleCode);
 }
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 5e8f1fe..d466081 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -658,4 +658,12 @@
 	public List<SysUser> getAllUsersByRoleId(String roleId) {
 		return userMapper.getAllUsersByRoleId(roleId);
 	}
+
+	/**
+	 * 鏍规嵁瑙掕壊缂栫爜鏌ヨ鐢ㄦ埛id闆嗗悎
+	 */
+	@Override
+	public List<String> getUserByRoleCode(String roleCode) {
+		return this.baseMapper.getUserByRoleCode(roleCode);
+	}
 }
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 98fee06..1a5e2ab 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
-server:
-  port: 9999
+锘縮erver:
+  port: 8080
   tomcat:
     max-swallow-size: -1
   error:
@@ -132,10 +132,11 @@
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:sqlserver://192.168.0.118:1433;databasename=LXZN_TEST_430
+#          url: jdbc:sqlserver://192.168.0.29:1433;databasename=LXZN_TEST_430
+          url: jdbc:sqlserver://30036q420j.yicp.fun:11047;databasename=LXZN_TEST_430
           username: sa
+#          password: LXZN@1688
           password: 123
-          #password: 123
           driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
           #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           #username: root
@@ -152,7 +153,7 @@
     database: 0
     host: 127.0.0.1
     port: 6379
-    password: 123456
+    password:
 #mybatis plus 璁剧疆
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml

--
Gitblit v1.9.3