From 474aabc5d2b4d6ccdd0d141ed06be87eb7559939 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 16 Jun 2026 10:22:51 +0800
Subject: [PATCH] feat(user): 添加用户注册时不设置密码的功能
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java
index ce74a1f..cc40aed 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/UserServiceImpl.java
@@ -76,6 +76,7 @@
private final BladeTenantProperties tenantProperties;
@Autowired
private DeptMapper deptMapper;
+
@Override
@Transactional(rollbackFor = Exception.class)
public boolean submit(User user) {
@@ -108,9 +109,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ public boolean submitNotPassword(User user) {
+ if (StringUtil.isBlank(user.getTenantId())) {
+ user.setTenantId(BladeConstant.ADMIN_TENANT_ID);
+ }
+ String tenantId = user.getTenantId();
+ Long userCount = baseMapper.selectCount(Wrappers.<User>query().lambda().eq(User::getTenantId, tenantId).eq(User::getAccount, user.getAccount()));
+ if (userCount > 0L && Func.isEmpty(user.getId())) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+ return save(user) && submitUserDept(user);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public boolean updateUser(User user) {
- Dept dept=deptMapper.selectOne(new LambdaQueryWrapper<Dept>().eq(Dept::getId, user.getDeptId()));
- user.setAreaCode(dept.getAreaCode());
+ Long deptId = Long.valueOf(user.getDeptId());
+ // 推荐写法：类型安全，自动处理参数绑定
+ Dept dept = deptMapper.selectById(deptId);
+ user.setAreaCode(null == dept ? null : dept.getAreaCode());
String tenantId = user.getTenantId();
Long userCount = baseMapper.selectCount(
Wrappers.<User>query().lambda()
@@ -205,7 +222,7 @@
public UserInfo userInfo(String tenantId, String account, UserEnum userEnum) {
User user = baseMapper.getUser(tenantId, account);
- log.debug("Auth的User信息"+user);
+ log.debug("Auth的User信息" + user);
return buildUserInfo(user, userEnum);
}
@@ -440,6 +457,7 @@
/**
* 获取用户id 与名称关系map key=id ,value=name
+ *
* @param userIds
* @return
*/
@@ -455,10 +473,19 @@
@Override
public List<Long> userIdsByName(String nickName) {
List<User> list = baseMapper.selectList(Wrappers.<User>lambdaQuery()
- .select(User::getId)
+ .select(User::getId)
.like(User::getName, nickName));
return Streams.toList(list, User::getId);
}
+ /**
+ *
+ * @param areaCode
+ * @param userIds
+ */
+ @Override
+ public void updateUserAreaCode(String areaCode, List<Long> userIds) {
+ baseMapper.updateUserAreaCode(areaCode, userIds);
+ }
}
--
Gitblit v1.9.3