From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 f050fa6..7cd9edf 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
@@ -6,8 +6,12 @@
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
+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.log.enums.OperatorType;
+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;
@@ -48,7 +52,7 @@
/**
* 添加计费策略管理
*/
- @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
+ @Log(title = "【我的】添加集团用户申请", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ApiOperation(tags = {"小程序-集团用户"},value = "添加集团用户申请")
@PostMapping(value = "/add")
public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
@@ -56,7 +60,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")
@@ -64,8 +69,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) {
@@ -78,12 +84,13 @@
// Page<TEnterpriseUserApplication> page = enterpriseUserApplicationService.lambdaQuery().in(TEnterpriseUserApplication::getAppUserId, userIds).page(Page.of(enterpriseQuery.getPageCurr(), enterpriseQuery.getPageSize()));
// return R.ok(page);
// }else {
- Page<TEnterpriseUserApplication> page = enterpriseUserApplicationService.lambdaQuery().eq(enterpriseQuery.getPhone()!=null&&enterpriseQuery.getPhone()!="",TEnterpriseUserApplication::getPhone,enterpriseQuery.getPhone()).page(Page.of(enterpriseQuery.getPageCurr(), enterpriseQuery.getPageSize()));
+ Page<TEnterpriseUserApplication> page = enterpriseUserApplicationService.lambdaQuery().eq(enterpriseQuery.getPhone()!=null&&enterpriseQuery.getPhone()!="",TEnterpriseUserApplication::getPhone,enterpriseQuery.getPhone()).orderByDesc(BasePojo::getCreateTime).page(Page.of(enterpriseQuery.getPageCurr(), enterpriseQuery.getPageSize()));
return R.ok(page);
// }
}
-
-
+
+
+ @RequiresPermissions(value = {"/groupUserApplication/export"}, logical = Logical.OR)
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "导出")
@PutMapping(value = "/export")
@Log(title = "【申请建桩】导出建桩申请列表", businessType = BusinessType.EXPORT)
@@ -116,9 +123,10 @@
// }
// }
}
-
-
-
+
+
+
+ @RequiresPermissions(value = {"/groupUserApplication/remark"}, logical = Logical.OR)
@Log(title = "【集团用户申请】填写备注", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"后台-申请表单-集团用户"},value = "备注")
@PostMapping(value = "/remark")
@@ -131,6 +139,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