From db0d72ef0c3507047c8adb2daf5a7682ee8f96ea Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 12 九月 2024 11:10:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 2 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 10 ++++++++++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java | 6 +++---
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index ee866d2..436a6d1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -28,7 +28,7 @@
public interface OtherClient {
//单位分页
- @PostMapping(value = "/t-invoice-type/t-company/unit/page")
+ @PostMapping(value = "/t-company/unit/page")
R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
//单位添加修改
@PostMapping(value = "/t-company/unit/addOrUpdate")
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
index caa9314..1a162d4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/BasePage.java
@@ -23,9 +23,9 @@
private Integer pageSize = 10;
public Integer getPageCurr() {
- if(null != pageCurr){
- pageCurr = (pageCurr - 1) * pageSize;
- }
+// if(null != pageCurr){
+// pageCurr = (pageCurr - 1) * pageSize;
+// }
return pageCurr;
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index 18c9545..ec0648d 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -44,6 +45,15 @@
}
return R.ok(data);
}
+ @ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
+ @GetMapping(value = "/tags/select")
+ public R<List<TUserTag>> select() {
+ TagListQueryDto tagListQueryDto = new TagListQueryDto();
+ tagListQueryDto.setPageCurr(1);
+ tagListQueryDto.setPageSize(999);
+ R<Page<TUserTag>> pageR = otherClient.queryTagPage(tagListQueryDto);
+ return R.ok(pageR.getData().getRecords());
+ }
@ApiOperation(value = "标签添加或修改", tags = {"用户管理-用户标签管理"})
--
Gitblit v1.7.1