From 0a66b4e946ebbe3ac09a193ad5a60cf7a95fe99d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 26 六月 2025 14:14:48 +0800
Subject: [PATCH] art: 删除base模块无用代码
---
src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 37f72de..35ecc9a 100644
--- a/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CacheConstant;
@@ -20,6 +21,8 @@
import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.base.entity.UserFactory;
+import org.jeecg.modules.base.mapper.UserFactoryMapper;
import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.*;
@@ -79,7 +82,7 @@
@Autowired
SysRoleIndexMapper sysRoleIndexMapper;
@Resource
- MdcUserProductionMapper mdcUserProductionMapper;
+ UserFactoryMapper userFactoryMapper;
@Resource
private ISysDictService sysDictService;
@Resource
@@ -519,7 +522,7 @@
// 2. 鍒犻櫎鐢ㄦ埛閮ㄩ棬鍏崇郴
line += sysUserDepartMapper.delete(new LambdaQueryWrapper<SysUserDepart>().in(SysUserDepart::getUserId, userIds));
// 3. 鍒犻櫎鐢ㄦ埛浜х嚎鍏崇郴
- line += mdcUserProductionMapper.delete(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getUserId, userIds));
+ line += userFactoryMapper.delete(new LambdaQueryWrapper<UserFactory>().in(UserFactory::getUserId, userIds));
//3. 鍒犻櫎鐢ㄦ埛瑙掕壊鍏崇郴
line += sysUserRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, userIds));
//4.鍚屾鍒犻櫎绗笁鏂笰pp鐨勭敤鎴�
@@ -588,9 +591,9 @@
//step.4 淇濆瓨鎵�灞炰骇绾�
if (oConvertUtils.isNotEmpty(selectedProductions)) {
arr = selectedProductions.split(",");
- for (String productionId : arr) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : arr) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//step.5 淇濆瓨璁惧鏉冮檺
@@ -658,11 +661,11 @@
array = productions.split(",");
}
//鍏堝垹鍚庡姞
- mdcUserProductionMapper.delete(new QueryWrapper<MdcUserProduction>().lambda().eq(MdcUserProduction::getUserId, user.getId()));
+ userFactoryMapper.delete(new QueryWrapper<UserFactory>().lambda().eq(UserFactory::getUserId, user.getId()));
if (oConvertUtils.isNotEmpty(productions)) {
- for (String productionId : array) {
- MdcUserProduction mdcUserProduction = new MdcUserProduction(user.getId(), productionId);
- mdcUserProductionMapper.insert(mdcUserProduction);
+ for (String factoryId : array) {
+ UserFactory userFactory = new UserFactory(user.getId(), factoryId);
+ userFactoryMapper.insert(userFactory);
}
}
//step.5 淇敼璁惧鏉冮檺
@@ -806,4 +809,17 @@
(existing, replacement) -> existing // 閲嶅閿鐞�
));
}
+
+
+ /**
+ * 鏍规嵁鐝粍Id鏌ヨ
+ * @param page
+ * @param groupId 鐝粍id
+ * @param username 鐢ㄦ埛璐︽埛鍚嶇О
+ * @return
+ */
+ @Override
+ public IPage<SysUser> getUserByGroupId(Page<SysUser> page, String groupId, String username) {
+ return userMapper.getUserByGroupId(page,groupId,username);
+ }
}
--
Gitblit v1.9.3