From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
index 615e03e..ab437e5 100644
--- a/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/system/service/impl/UserServiceImpl.java
@@ -20,6 +20,7 @@
import com.oying.exception.EntityExistException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -128,8 +129,10 @@
// 清除缓存
delCaches(user.getId(), user.getUsername());
// 更新用户角色
- userRoleMapper.deleteByUserId(resources.getId());
- userRoleMapper.insertData(resources.getId(), resources.getRoles());
+ if (!ObjectUtils.isEmpty(resources.getRoles())) {
+ userRoleMapper.deleteByUserId(resources.getId());
+ userRoleMapper.insertData(resources.getId(), resources.getRoles());
+ }
}
@Override
@@ -206,6 +209,14 @@
}
@Override
+ public void updateRiderOpenId(User user1) {
+ User user = new User();
+ user.setId(user1.getId());
+ user.setRiderOpenId(user1.getRiderOpenId());
+ userMapper.updateById(user);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public Map<String, String> updateAvatar(MultipartFile multipartFile) {
// 文件大小验证
--
Gitblit v1.9.3