From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeButtonClient.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeButtonClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeButtonClient.java
index 9170f02..2acb0df 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeButtonClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeButtonClient.java
@@ -18,8 +18,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.vci.ubcs.code.entity.CodeButtonEntity;
-import com.vci.ubcs.code.entity.CodeKeyattrrepeatEntity;
+import com.vci.ubcs.code.entity.CodeButton;
import com.vci.ubcs.code.mapper.CodeButtonMapper;
import com.vci.ubcs.code.service.ICodeButtonService;
import lombok.AllArgsConstructor;
@@ -48,13 +47,13 @@
@Override
@GetMapping(TOP)
- public BladePage<CodeButtonEntity> top(Integer current, Integer size) {
+ public BladePage<CodeButton> top(Integer current, Integer size) {
Query query = new Query();
query.setCurrent(current);
query.setSize(size);
// IPage<CodeKeyattrrepeatEntity> page = codeKeyattrrepeatMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
- IPage<CodeButtonEntity> page = codeButtonMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
+ IPage<CodeButton> page = codeButtonMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper());
// IPage<CodeKeyattrrepeatEntity> page = codebuttonService.page(Condition.getPage(query));
// return null;
return BladePage.of(page);
--
Gitblit v1.9.3