权限点查询

eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/BaseEntity.java

@@ -11,6 +11,7 @@ import com.fhs.core.trans.anno.Trans;
 import com.fhs.core.trans.constant.TransType;
 import com.fhs.core.trans.vo.TransPojo;
 import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.RelationOneToOne;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -54,7 +55,7 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 创建者
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "createByName")
+//    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "createByName")
     private String createBy;
 
     /**
@@ -72,13 +73,19 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 更新者
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "updateByName")
+//    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "updateByName")
     private String updateBy;
 
     /**
      * 更新者-姓名
      */
     @Column(ignore = true)
+    @RelationOneToOne(
+            selfField = "updateBy",
+            targetTable = "system_user_t",
+            targetField = "userId",
+            valueField = "userName"
+    )
     private String updateByName;
 
     /**

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/menu/IMenuService.java

@@ -13,6 +13,7 @@ import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @description IMenuService

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/menu/MenuService.java

@@ -19,6 +19,7 @@ import org.eco.vip.orm.utils.RandomUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
 
 import static org.eco.vip.auth.domain.menu.table.MenuTableDef.MENU;
 

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/org/OrgService.java

@@ -8,6 +8,7 @@ package org.eco.vip.auth.service.org;
 
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.org.Org;
 import org.eco.vip.auth.domain.org.pojo.OrgBO;
 import org.eco.vip.auth.domain.org.pojo.OrgVO;
@@ -36,6 +37,9 @@ import static org.eco.vip.auth.domain.org.table.OrgTableDef.ORG;
 @Service
 public class OrgService extends BaseService<OrgMapper, Org> implements IOrgService {
 
+    @Resource
+    private OrgMapper orgMapper;
+
     private QueryWrapper buildQueryWrapper(OrgBO orgBO) {
         return super.buildBaseQueryWrapper()
                 .and(ORG.ORG_ID.eq(orgBO.getOrgId()))
@@ -56,7 +60,9 @@ public class OrgService extends BaseService<OrgMapper, Org> implements IOrgServi
     @Override
     public List<OrgVO> selectList(OrgBO orgBO) {
         QueryWrapper queryWrapper = buildQueryWrapper(orgBO);
-        return this.listAs(queryWrapper, OrgVO.class);
+//        this.s
+        return orgMapper.selectListWithRelationsByQueryAs(queryWrapper, OrgVO.class);
+//        return this.listAs(queryWrapper, OrgVO.class);
     }
 
     @Override

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/permission/IPermissionService.java

@@ -27,20 +27,20 @@ public interface IPermissionService extends IBaseService<Permission> {
     List<PermissionVO> selectList();
 
     /**
-     * 获取菜单数据权限
+     * 获取权限
      *
      * @param userId  用户id
      * @return 菜单权限信息
      */
-    Set<String> getMenuPermission(String userId);
+    Set<String> getPermissionCodes(String userId);
 
     /**
-     * 获取角色数据权限
+     * 获取角色权限
      *
      * @param userId  用户id
      * @return 角色权限信息
      */
-    Set<String> getRolePermission(String userId);
+    Set<String> getRoleCodes(String userId);
 
 
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/permission/PermissionService.java

@@ -6,9 +6,11 @@ package org.eco.vip.auth.service.permission;
 
 
 import com.mybatisflex.core.query.QueryWrapper;
+import jakarta.annotation.Resource;
 import org.eco.vip.auth.domain.permission.Permission;
 import org.eco.vip.auth.domain.permission.pojo.PermissionVO;
 import org.eco.vip.auth.mapper.PermissionMapper;
+import org.eco.vip.auth.service.menu.IMenuService;
 import org.eco.vip.orm.service.BaseService;
 import org.eco.vip.orm.utils.BeanUtils;
 import org.eco.vip.orm.utils.StrUtils;
@@ -31,6 +33,9 @@ import java.util.Set;
 @Service
 public class PermissionService extends BaseService<PermissionMapper, Permission> implements IPermissionService, ISecurityPermissionService {
 
+    @Resource
+    private IMenuService menuService;
+
     @Override
     public List<PermissionVO> selectList() {
         QueryWrapper queryWrapper = new QueryWrapper();
@@ -38,17 +43,23 @@ public class PermissionService extends BaseService<PermissionMapper, Permission>
     }
 
     @Override
-    public Set<String> getMenuPermission(String userId) {
-        return Set.of();
+    public Set<String> getPermissionCodes(String userId) {
+        Set<String> perms = new HashSet<>();
+        if (LoginHelper.isSuperAdmin(userId)) {
+            perms.add("*:*:*");
+        } else {
+            perms.addAll(null);
+        }
+        return perms;
     }
 
     @Override
-    public Set<String> getRolePermission(String userId) {
+    public Set<String> getRoleCodes(String userId) {
         Set<String> perms = new HashSet<>();
         if (LoginHelper.isSuperAdmin(userId)) {
             perms.add("*:*:*");
         } else {
-            QueryWrapper queryWrapper = new QueryWrapper();
+            perms.addAll(null);
         }
 
         return perms;

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/role/IRoleService.java

@@ -14,6 +14,7 @@ import org.eco.vip.orm.pojo.PageResult;
 import org.eco.vip.orm.service.IBaseService;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @description IRoleService
@@ -71,4 +72,12 @@ public interface IRoleService extends IBaseService<Role> {
      * @return 结果
      */
     RoleVO selectById(String id);
+
+    /**
+     * 根据用户ID查询角色权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    Set<String> selectRolePermissionByUserId(String userId);
 }

eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/service/role/RoleService.java

@@ -20,6 +20,7 @@ import org.eco.vip.orm.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @description RoleService
@@ -68,4 +69,9 @@ public class RoleService extends BaseService<RoleMapper, Role> implements IRoleS
     public RoleVO selectById(String id) {
         return null;
     }
+
+    @Override
+    public Set<String> selectRolePermissionByUserId(String userId) {
+        return Set.of();
+    }
 }