From f0ffb844dca9fd66709c9ed9b564026893cd2a63 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 8 Oct 2024 09:43:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0sql=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/system/controller/SysProfileController.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
index fc25adc..5fd22d5 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
@@ -120,6 +120,7 @@ public class SysProfileController extends BaseController {
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping("/avatar")
     public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file,String fileType) throws Exception {
+        try {
             FileInfo fileInfo = sysFileService.uploadHeadPic(file, fileType);
             if (!file.isEmpty()) {
                 LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -140,6 +141,9 @@ public class SysProfileController extends BaseController {
                     return ajax;
                 }
             }
+        } catch (Exception e) {
+            throw new RuntimeException("系统异常，请联系管理员！");
+        }
         return error("上传图片异常，请联系管理员");
     }
 }

From 69f64d0b4141610f57a3268109e09fa6d395aa17 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 8 Oct 2024 10:31:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/system/controller/SysUserController.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
index 6302af7..188fb02 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
@@ -179,6 +179,7 @@ public class SysUserController extends BaseController {
     public AjaxResult getInfo() {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = userService.selectUserById(SecurityUtils.getLoginUser().getUserid());
+        user.setPassword(null);
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合

From 9f6df86316b097ee5900befd151c94c729d30230 Mon Sep 17 00:00:00 2001
From: wcy <761646706@qq.com>
Date: Tue, 8 Oct 2024 14:43:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=92=E8=89=B2id=E4=B8=BA1=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=A9=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
index 85834ca..7fafecf 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysUserServiceImpl.java
@@ -436,6 +436,9 @@ public class SysUserServiceImpl implements ISysUserService {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
+                if (roleId.equals(1)){
+                    continue;
+                }
                 list.add(ur);
             }
             userRoleMapper.batchUserRole(list);