From cb46cadf5a673f53a4ddcf93cadd1f376a9adeea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 19 八月 2024 17:45:46 +0800
Subject: [PATCH] 8.19.1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 d64bb4d..113df1d 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
@@ -2,16 +2,17 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
-import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-
import org.springframework.web.bind.annotation.RestController;
/**
@@ -27,19 +28,31 @@
public class TEnterpriseUserApplicationController {
private final TEnterpriseUserApplicationService enterpriseUserApplicationService;
+ private final TokenService tokenService;
@Autowired
- public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService) {
+ public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService, TokenService tokenService) {
this.enterpriseUserApplicationService = enterpriseUserApplicationService;
+ this.tokenService = tokenService;
}
/**
* 添加计费策略管理
*/
+ @Log(title = "添加集团用户申请", businessType = BusinessType.INSERT)
@ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请")
@PostMapping(value = "/add")
- public AjaxResult<Boolean> add(@RequestBody TEnterpriseUserApplication dto) {
- // TODO 用户id
+ public AjaxResult<Boolean> add(@Validated @RequestBody TEnterpriseUserApplication dto) {
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
+ return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
+ }
+
+ @ApiOperation(tags = {"后台-申请表单-集团用户"},value = "集团用户列表")
+ @PostMapping(value = "/page")
+ public AjaxResult<Boolean> page(@RequestBody TEnterpriseUserApplication dto) {
+ // 用户id
+ dto.setAppUserId(tokenService.getLoginUserApplet().getUserId());
return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
}
--
Gitblit v1.7.1