From 8dc28c815eb0acdb5af82c2667eec45efd0507c5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 18 三月 2025 09:34:46 +0800
Subject: [PATCH] 车间绑定调整
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
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 cc655fc..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,8 @@
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;
import org.springframework.stereotype.Service;
@@ -24,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);
}
@@ -38,7 +53,7 @@
* @return
*/
@Override
- public User getUserNow() {
+ public UserVo getUserNow() {
return baseMapper.getUserNow(SecurityUtils.getUserId().intValue());
}
@@ -51,12 +66,23 @@
return baseMapper.selectUserDepartmentLimsName(SecurityUtils.getUserId().intValue());
}
+ /**
+ * 淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ * @param ids
+ * @param id
+ * @return
+ */
@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()));
}
+ /**
+ * 鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�
+ * @param id
+ * @return
+ */
@Override
public int delUserDepardLimsId(Integer id) {
return baseMapper.update(null, Wrappers.<User>lambdaUpdate().eq(User::getId, id).set(User::getDepartLimsId, null).set(User::getUpdateTime, LocalDateTime.now()).set(User::getUpdateBy, SecurityUtils.getUsername()));
--
Gitblit v1.9.3