From e51978120749d4609d61c93b53ea282d6e115fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=BE=E6=96=87=E8=B1=AA?= <980287353@qq.com>
Date: Wed, 18 Sep 2024 14:52:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=81=8C=E4=BD=8D=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/tiesheng/demo/controller/TestController.java  | 7 +++++++
 .../java/com/tiesheng/role/service/CoreRoleService.java    | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
index 06f8b25..9cdd156 100644
--- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
+++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java
@@ -84,6 +84,13 @@ public class TestController {
         String jsonString = JSON.toJSONString(jsonTest);
         LogFactory.get().info(jsonString);
 
+
+//        String data = "0moeVHD0879FOJzCORIxc3SDFIsgzDBCmrZSCORLXPxMUtruvUifSME7xanfM3cJd6qgYRN7yIhL7Jc29PTy9DIhBMzEV3VYcN4r+WYw7VDHMIVJ9nprKqekHgujJtdHiUNKdYYm7yDhlb8cZE4Gam5/xTV20BZk92EV08/4S9A5txZCj2ETJ9/51WEeoC2V1Z3tVFdbOx2ktbygeOce3BUD5/q9UGRf59xshDe6Yow=";
+        String data = "C9g1Kr5UttpMdFWOvAvVTyUMjpNuCJglVv5mkF0ZexkjUPE9XJAFtJegV5x3bAJnN/8Coe18s/eQ+PhwN1cRMCChiOjbjOD4raqlTVjwCDzV/d7BD2b1nVI3J38tDBE26GDQ158MY3d7Q554wTahy8uvNoo+tFyVpMVw0B6GPW2IEF8KYU3u62eur+x2FhoSuPkPAyNpcwAK8hrC3m684lBc8+l3+zs7re0wSd0ypf7hD5QbEE+NbkBMJAOv78CXmhgTQ6zXerKmPEIw+gvviODoHbcsqUODLnCVyny0xTNzAHeNciYZgKarNu5aherI";
+        String decrypt = encryptConfig.decrypt(data);
+        LogFactory.get().info(decrypt);
+
+
 //        ArrayList<String> strings = CollUtil.newArrayList("11111", "22222");
 //        coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer<String>() {
 //            @Override
diff --git a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
index 3909e31..1fcdeba 100644
--- a/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
+++ b/springboot-role/src/main/java/com/tiesheng/role/service/CoreRoleService.java
@@ -138,7 +138,6 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
             coreRoleGroupRxMapper.batchInsert(list);
             onRoleChange(dto.getId(), "");
         }
-
     }
 
 
@@ -148,6 +147,9 @@ public class CoreRoleService extends TsServiceBase<CoreRoleGroupMapper, CoreRole
      * @param roleUser
      */
     public void roleUserUpdate(CoreRoleUser roleUser) {
+        Validator.validateNotEmpty(roleUser.getType(), "请选择授权方式");
+        Validator.validateNotEmpty(roleUser.getTypeId(), "请选择授权" + (Objects.equals(roleUser.getType(), "menu") ? "菜单" : "职位"));
+
         if (StrUtil.isNotEmpty(roleUser.getId())) {
             coreRoleUserMapper.updateById(roleUser);
         } else {