From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index 7fbd48d..53de504 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -45,6 +45,7 @@
import com.vci.ubcs.system.user.vo.UserVO;
import com.vci.ubcs.system.user.wrapper.UserWrapper;
import lombok.RequiredArgsConstructor;
+import org.springblade.core.log.annotation.GrantLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -127,6 +128,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
+ @GrantLog("grantUser")
public boolean updateUser(User user) {
String tenantId = user.getTenantId();
Long userCount = baseMapper.selectCount(
@@ -135,6 +137,7 @@
.eq(User::getAccount, user.getAccount())
.notIn(User::getId, user.getId())
);
+ // 鍒ゆ柇鏄惁琚慨鏀逛负宸插瓨鍦ㄧ殑鐢ㄦ埛鍚�
if (userCount > 0L) {
throw new ServiceException(StringUtil.format("褰撳墠鐢ㄦ埛 [{}] 宸插瓨鍦�!", user.getAccount()));
}
@@ -179,6 +182,9 @@
private boolean submitUserDept(User user) {
List<Long> deptIdList = Func.toLongList(user.getDeptId());
+ if(deptIdList.isEmpty()){
+ return true;
+ }
List<UserDept> userDeptList = new ArrayList<>();
deptIdList.forEach(deptId -> {
UserDept userDept = new UserDept();
@@ -348,6 +354,16 @@
return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
}
+ /**
+ * 鎺堟潈鏃ュ織鎻掑叆鎿嶄綔
+ * @param res
+ */
+ @Override
+ @GrantLog("grantUser")
+ public boolean grantLog(String res, boolean isException){
+ return true;
+ }
+
@Override
public boolean resetPassword(String userIds) {
User user = new User();
@@ -362,9 +378,6 @@
if (!newPassword.equals(newPassword1)) {
throw new ServiceException("璇疯緭鍏ユ纭殑纭瀵嗙爜!");
}
- if (!user.getPassword().equals(DigestUtil.hex(oldPassword))) {
- throw new ServiceException("鍘熷瘑鐮佷笉姝ｇ‘!");
- }
//鑾峰彇鐢ㄦ埛閲囩敤鐨勫瘑鐮佺瓥鐣�
Strategy strategy = sysClient.getByUserId(userId).getData();
// 鍑犱箮涓嶄細鍑虹幇杩欑鎯呭喌
@@ -375,6 +388,11 @@
if(newPassword1.length() < strategy.getMinPwdLen() || newPassword1.length() > strategy.getMaxPwdLen()){
throw new ServiceException("瀵嗙爜涓繀椤诲惈鏈夈��"+strategy.getCombinationNames()+"銆戜腑鐨勩��"+strategy.getRequiredType()+"銆戠瀵嗙爜缁勫悎鏂瑰紡锛屼笖瀵嗙爜闀垮害蹇呴』鍦ㄣ��"+strategy.getMinPwdLen()+"-"+strategy.getMaxPwdLen()+"銆戣寖鍥村唴");
}
+
+ String hexOldPassword = DigestUtil.hex(oldPassword);
+ if (!user.getPassword().equals(hexOldPassword)) {
+ throw new ServiceException("鍘熷瘑鐮佷笉姝ｇ‘!");
+ }
List<String> regexs = sysClient.getRegexByList(Arrays.asList(strategy.getCombinationIds().split(","))).getData();
//鍒ゆ柇鏄惁婊¤冻缁勫悎鏂瑰紡涓殑蹇呭～绉嶇被鏁�
int reqType = 0;
--
Gitblit v1.9.3