From 1b8098b7f79b66a80e5ca49d8765606cb5fa0408 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 30 十一月 2023 19:11:00 +0800
Subject: [PATCH] 操作日志完善

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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..ff717d9 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();

--
Gitblit v1.9.3