From e12a3875f9b1b0a5226786f616871e390e39f326 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 20:36:35 +0800
Subject: [PATCH] 修改全局人员查询
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 16 +++++++
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 37 ++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 15 +++++++
ruoyi-admin/src/main/resources/application.yml | 6 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 22 ++++++-----
6 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index dfaa489..5e47ddc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -224,17 +224,19 @@
// 鏌ヨ鍘傚瀵嗗害
String supplierDensity = "";
- SampleProductDto sampleProductDto = list.get(0);
+ if (CollectionUtils.isNotEmpty(list)) {
+ SampleProductDto sampleProductDto = list.get(0);
- // 鍒ゆ柇鏈夋病鏈夌粦瀹氬瀷鍙�
- String modelValue = insSampleMapper.selectSupplierDensityModel(sampleProductDto.getSample(),
- order.getProduction(),
- sampleProductDto.getModel());
- if (StringUtils.isNotBlank(modelValue)) {
- supplierDensity = modelValue;
- } else {
- supplierDensity = insSampleMapper.selectSupplierDensity(sampleProductDto.getSample(),
- order.getProduction());
+ // 鍒ゆ柇鏈夋病鏈夌粦瀹氬瀷鍙�
+ String modelValue = insSampleMapper.selectSupplierDensityModel(sampleProductDto.getSample(),
+ order.getProduction(),
+ sampleProductDto.getModel());
+ if (StringUtils.isNotBlank(modelValue)) {
+ supplierDensity = modelValue;
+ } else {
+ supplierDensity = insSampleMapper.selectSupplierDensity(sampleProductDto.getSample(),
+ order.getProduction());
+ }
}
map.put("supplierDensity", supplierDensity);
return map;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index 6a0241a..0d8cac6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -28,7 +28,7 @@
/**
* todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
- type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
+ type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
* @param user
* @param type
* @return
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index af7aa5f..690f2d7 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -19,7 +19,7 @@
port: 8001
servlet:
# 搴旂敤鐨勮闂矾寰�
- context-path: /lims
+ context-path:
tomcat:
# tomcat鐨刄RI缂栫爜
uri-encoding: UTF-8
@@ -46,7 +46,7 @@
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
basename: i18n/messages
profiles:
- active: ztzb
+ active: druid
# 鍏ㄥ眬鏃堕棿澶勭悊 LocalDateTime鏃堕棿搴忓垪鍙�
jackson:
date-format: yyyy-MM-dd HH:mm:ss
@@ -93,6 +93,6 @@
url: https://ztt-sso.asuncloud.net
clientId: 47ded514-f447-43b4-afdf-181c10e2222d
clientSecret: appSecret:ea93d26a68863da5d71a6e3355ec22df
- callbackUrl: https://ztzb-lims.ztt.cn/logindemo
+ callbackUrl: https://ztzb-lims.ztt.cn/thirdpartylogin
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index b5d0ddb..210f2f9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -45,5 +45,20 @@
* @return
*/
UserVo getUserNow(@Param("userId") int userId);
+
+ /**
+ * 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * @return
+ */
+ List<User> selectQualityUserList();
+
+ /**
+ * 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
+ * @param userId
+ * @return
+ */
+ List<User> selectDepartmentLimsUserList(@Param("userId") Integer userId);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
index 485c6b4..71fe3b3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.vo.UserVo;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.UserService;
@@ -25,12 +26,25 @@
/**
* 鏍规嵁鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃
+ * * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * type : 2: 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�
* @param user
* @param type
* @return
*/
@Override
public List<User> selectUserCondition(User user, String type) {
+ if (StringUtils.isNotEmpty(type)) {
+
+ switch (type) {
+ case "1":
+ return baseMapper.selectQualityUserList();
+ case "2":
+ return baseMapper.selectDepartmentLimsUserList(SecurityUtils.getUserId().intValue());
+ }
+
+ }
+
return baseMapper.selectUserCondition(QueryWrappers.queryWrappers(user), type);
}
@@ -61,7 +75,7 @@
@Override
public int upUserDepardLimsId(String ids, String id) {
List<Integer> userIds = JSON.parseArray(ids, Integer.class);
- return baseMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy,SecurityUtils.getLoginUser().getUsername()));
+ return baseMapper.update(null, Wrappers.<User>lambdaUpdate().in(User::getId, userIds).set(User::getDepartLimsId, id).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy, SecurityUtils.getLoginUser().getUsername()));
}
/**
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 922251a..f16af39 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -24,7 +24,8 @@
company,
is_custom
from user
- where del_flag = '0') a
+ where del_flag = '0'
+ and id != ) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -60,4 +61,38 @@
left join custom c on u.company = c.id
where u.id = #{userId}
</select>
+
+ <!-- 鑾峰彇妫�娴嬩汉鍛樹俊鎭� -->
+ <select id="selectQualityUserList" resultType="com.ruoyi.common.core.domain.entity.User">
+ select u1.id,
+ u1.account,
+ u1.name,
+ u1.age,
+ u1.email,
+ u1.phone,
+ u1.company,
+ u1.is_custom,
+ u1.signature_url,
+ u1.picture_url,
+ u1.name_en,
+ u1.depart_lims_id
+ from user u1
+ left join sys_user_role sur on sur.user_id = u1.id
+ where sur.role_id not in (1, 15, 16, 17)
+ and u1.status = '0'
+ group by u1.id
+ </select>
+
+ <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴� -->
+ <select id="selectDepartmentLimsUserList" resultType="com.ruoyi.common.core.domain.entity.User">
+ select id,
+ account,
+ name,
+ name_en
+ from user u
+ where depart_lims_id = (select u2.depart_lims_id
+ from user u2
+ where u2.id = #{userId})
+ </select>
+
</mapper>
--
Gitblit v1.9.3