From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
index 6e3ae1c..4d800c2 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java
@@ -9,6 +9,8 @@
 import com.ruoyi.common.core.web.domain.BasePojo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
 import com.ruoyi.other.query.PassDto;
@@ -57,7 +59,8 @@
         dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
         return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
     }
-
+    
+    @RequiresPermissions(value = {"/groupUserApplication/add"}, logical = Logical.OR)
     @Log(title = "【集团用户申请】添加集团用户申请", businessType = BusinessType.INSERT)
     @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "后台添加集团用户申请")
     @PostMapping(value = "/back/add")
@@ -65,8 +68,9 @@
         // 用户id
         return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
     }
-
-
+    
+    
+    @RequiresPermissions(value = {"/groupUserApplication"}, logical = Logical.OR)
     @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
     @PostMapping(value = "/page")
     public R<Page<TEnterpriseUserApplication>> page(@RequestBody EnterpriseQuery enterpriseQuery) {
@@ -83,8 +87,9 @@
             return R.ok(page);
 //        }
     }
-
-
+    
+    
+    @RequiresPermissions(value = {"/groupUserApplication/export"}, logical = Logical.OR)
     @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "导出")
     @PutMapping(value = "/export")
     @Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
@@ -117,9 +122,10 @@
 //            }
 //        }
     }
-
-
-
+    
+    
+    
+    @RequiresPermissions(value = {"/groupUserApplication/remark"}, logical = Logical.OR)
     @Log(title = "【集团用户申请】填写备注", businessType = BusinessType.INSERT)
     @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "备注")
     @PostMapping(value = "/remark")
@@ -132,6 +138,8 @@
         return AjaxResult.success();
     }
     
+    
+    @RequiresPermissions(value = {"/groupUserApplication/del"}, logical = Logical.OR)
     @Log(title = "【集团用户申请】删除申请数据", businessType = BusinessType.DELETE)
     @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "删除")
     @DeleteMapping(value = "/delete")

--
Gitblit v1.7.1