Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-06-20 cffe7729a3c9f77ad1423bee2da82505a323ffa1

 server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java

@@ -134,7 +134,7 @@
                role.setDeleted(Boolean.FALSE);
                roles =   systemRoleService.findList(role);
                SystemPermission p = new SystemPermission();
                permissions =  systemPermissionService.findList(p);
                permissions =  systemPermissionService.findList(p,user.getType());
            }else{
                roles =   systemRoleService.findByUserId(user.getId());
                permissions =  systemPermissionService.findByUserId(user.getId());