Browse Source

更新!

TRX 1 year ago
parent
commit
f2c47c8552

+ 10 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/scene/ProjectSceneInfoController.java

@@ -1,5 +1,6 @@
 package com.zhongshu.card.server.core.controller.scene;
 
+import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
@@ -36,6 +37,15 @@ public class ProjectSceneInfoController {
     @Autowired
     private ProjectSceneInfoService projectSceneInfoService;
 
+    @ResourceAuth(value = "projectSceneManager", type = AuthType.Project, remark = "项目场景_应用场景管理_168_Menu")
+    @ResourceAuth(value = "projectSceneManager", type = AuthType.School, remark = "项目场景_应用场景管理_168_Menu")
+    @ResourceAuth(value = "projectSceneManager", type = AuthType.BusinessMain, remark = "项目场景_应用场景管理_168_Menu")
+    @ResourceAuth(value = "projectSceneManager", type = AuthType.CommonOrg, remark = "项目场景_应用场景管理_168_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "项目场景列表-分页查询", description = "项目场景列表-分页查询")
     @RequestMapping(value = {"page"}, method = {RequestMethod.POST})

+ 15 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/OrgMenuController.java

@@ -5,7 +5,6 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import io.swagger.v3.oas.annotations.Hidden;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -245,6 +244,21 @@ public class OrgMenuController {
 //    @RequestMapping(value = "projectAreaTypeManager", method = {RequestMethod.GET})
 //    public ResultContent projectAreaTypeManager() {
 //        return ResultContent.buildSuccess();
+//    }
+
+//    @ResourceAuth(value = "projectSceneManager", type = AuthType.Project, remark = "项目场景_应用场景管理_168_Menu")
+//    @ResourceAuth(value = "projectSceneManager", type = AuthType.School, remark = "项目场景_应用场景管理_168_Menu")
+//    @ResourceAuth(value = "projectSceneManager", type = AuthType.BusinessMain, remark = "项目场景_应用场景管理_168_Menu")
+//    @ResourceAuth(value = "projectSceneManager", type = AuthType.CommonOrg, remark = "项目场景_应用场景管理_168_Menu")
+//    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.Project, remark = "")
+//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.School, remark = "")
+//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.BusinessMain, remark = "")
+//    @ResourceAuth(value = AuthConstant.Admin, type = AuthType.CommonOrg, remark = "")
+//    @ResourceAuth(value = "user", type = AuthType.User)
+//    @RequestMapping(value = "projectSceneManager", method = {RequestMethod.GET})
+//    public ResultContent projectSceneManager() {
+//        return ResultContent.buildSuccess();
 //    }
 
     @ResourceAuth(value = "projectOpenAPIManager", type = AuthType.Project, remark = "OpenAPI_应用管理_170_Menu")

+ 8 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/tempMenus/PlatformMenuController.java

@@ -81,6 +81,14 @@ public class PlatformMenuController {
         return ResultContent.buildSuccess();
     }
 
+    @ResourceAuth(value = "platSceneManager", type = AuthType.Platform, remark = "场景_应用场景管理_85_Menu")
+    @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "platSceneManager", method = {RequestMethod.GET})
+    public ResultContent platSceneManager() {
+        return ResultContent.buildSuccess();
+    }
+
     @ResourceAuth(value = "platSettingManager", type = AuthType.Platform, remark = "系统设置_平台基本信息_90_Menu")
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform, remark = "")
     @ResourceAuth(value = "user", type = AuthType.User)

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/scene/ProjectSceneInfoService.java

@@ -91,7 +91,7 @@ public class ProjectSceneInfoService extends SuperService {
             SceneInfo entity = sceneInfoDao.findTopById(id);
             if (ObjectUtils.isNotEmpty(entity)) {
                 ProjectSceneInfo projectSceneInfo = buildProjectScene(entity, organization);
-                if (ObjectUtils.isEmpty(projectSceneInfo)) {
+                if (ObjectUtils.isNotEmpty(projectSceneInfo)) {
                     list.add(projectSceneInfo);
                 }
             }