web-domain/src/main/java/com/zcloud/certificate/domain/enums/MenuEnum.java

@@ -1,53 +0,0 @@
-package com.zcloud.certificate.domain.enums;
-
-import lombok.Getter;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * 菜单枚举
- */
-@Getter
-public enum MenuEnum {
-    // 企业端
-    QYD_TZZYRUGL("/certificate/container/branchCompany/enterpriseLicense/personnelLicense/specialPersonnel/list", "qyd-tzzyrugl"),
-    QYD_TZSBCZRYGL("/certificate/container/branchCompany/enterpriseLicense/personnelLicense/specialDevice/list", "qyd-tzsbczrygl"),
-    QYD_ZYFZRGL("/certificate/container/branchCompany/enterpriseLicense/personnelLicense/personInCharge/list", "qyd-zyfzrgl"),
-    QYD_AQSCGLRYGL("/certificate/container/branchCompany/enterpriseLicense/personnelLicense/securityAdmini/list", "qyd-aqscglrygl"),
-
-    // 股份端
-    GFD_TZZYRUGL("/certificate/container/supervision/personnelLicense/specialPersonnel/list", "gfd-tzzyrugl"),
-    GFD_TZSBCZRYGL("/certificate/container/supervision/personnelLicense/specialDevice/list", "gfd-tzsbczrygl"),
-    GFD_QYZYFZRGL("/certificate/container/supervision/personnelLicense/personInCharge/list", "gfd-qyzyfzrgl"),
-    GFD_QYAQSCGLRYGL("/certificate/container/supervision/personnelLicense/securityAdmini/list", "gfd-qyaqscglrygl"),
-
-    // 相关方端
-    XGFD_TZZYRUGL("/certificate/container/stakeholder/enterpriseLicense/personnelLicense/specialPersonnel/List", "xgfd-tzzyrugl"),
-    XGFD_TZZZSBCZRYGL("/certificate/container/stakeholder/enterpriseLicense/personnelLicense/specialDevice/List", "xgfd-tzzzsbczrygl"),
-    XGFD_ZYFZRGL("/certificate/container/stakeholder/enterpriseLicense/personnelLicense/personInCharge/List", "xgfd-zyfzrgl"),
-    XGFD_AQSCGLRYGL("/certificate/container/stakeholder/enterpriseLicense/personnelLicense/securityAdmini/List", "xgfd-aqscglrygl");
-
-    private final String path;
-    private final String menuKey;
-
-    private static final Map<String, MenuEnum> PATH_MAP =
-            Arrays.stream(values())
-                    .collect(Collectors.toMap(MenuEnum::getPath, Function.identity()));
-
-    MenuEnum(String path, String menuKey) {
-        this.path = path;
-        this.menuKey = menuKey;
-    }
-
-    public static MenuEnum getByPath(String path) {
-        return PATH_MAP.get(path);
-    }
-
-    public static String getMenuKeyByPath(String path) {
-        MenuEnum menuEnum = PATH_MAP.get(path);
-        return menuEnum != null ? menuEnum.getMenuKey() : null;
-    }
-}

web-infrastructure/src/main/java/com/zcloud/certificate/persistence/mapper/UserCertificateMapper.java

@@ -19,7 +19,7 @@ import java.util.Map;
 */
 @Mapper
 @DataScopes({
-        @DataScope(method = "selectPageWithUser",  menuPerms = "")
+        @DataScope(method = "selectPageWithUser",  menuPerms = "zhgl2")
 })
 public interface UserCertificateMapper extends BaseMapper<UserCertificateDO> {
 
@@ -31,7 +31,7 @@ public interface UserCertificateMapper extends BaseMapper<UserCertificateDO> {
     /**
      * 分页查询用户证书信息，包含用户名称
      */
-    IPage<UserCertificateDO> selectPageWithUser(IPage<UserCertificateDO> page, @Param("params") Map<String, Object> params, String menuPerms);
+    IPage<UserCertificateDO> selectPageWithUser(IPage<UserCertificateDO> page, @Param("params") Map<String, Object> params);
 
     /**
      * 分页查询用户证书信息，包含用户名称，无权限控制

web-infrastructure/src/main/java/com/zcloud/certificate/persistence/repository/impl/UserCertificateRepositoryImpl.java

@@ -1,6 +1,5 @@
 package com.zcloud.certificate.persistence.repository.impl;
 
-import com.zcloud.certificate.domain.enums.MenuEnum;
 import com.zcloud.certificate.persistence.dataobject.UserCertificateDO;
 import com.zcloud.certificate.persistence.dataobject.UserCertificateStatDO;
 import com.zcloud.certificate.persistence.mapper.UserCertificateMapper;
@@ -47,11 +46,7 @@ public class UserCertificateRepositoryImpl extends BaseRepositoryImpl<UserCertif
     @Override
     public PageResponse<UserCertificateDO> listPageWithUser(Map<String, Object> params) {
         IPage<UserCertificateDO> page = new Query<UserCertificateDO>().getPage(params);
-        String menuPerms = "";
+        IPage<UserCertificateDO> iPage = userCertificateMapper.selectPageWithUser(page, params);
-        if (!org.springframework.util.ObjectUtils.isEmpty(params.get("menuPath"))){
-            menuPerms = MenuEnum.getMenuKeyByPath(params.get("menuPath").toString());
-        }
-        IPage<UserCertificateDO> iPage = userCertificateMapper.selectPageWithUser(page, params, menuPerms);
         return PageHelper.pageToResponse(iPage, iPage.getRecords());
     }