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/CodeTempphaseClient.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java index d39f37d..03b4fd3 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeTempphaseClient.java @@ -18,7 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.vci.ubcs.code.entity.CodeTempphaseEntity; +import com.vci.ubcs.code.entity.CodeTemplatePhase; import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.BladePage; @@ -43,11 +43,11 @@ @Override @GetMapping(TOP) - public BladePage<CodeTempphaseEntity> top(Integer current, Integer size) { + public BladePage<CodeTemplatePhase> top(Integer current, Integer size) { Query query = new Query(); query.setCurrent(current); query.setSize(size); - IPage<CodeTempphaseEntity> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper()); + IPage<CodeTemplatePhase> page = codeTempphaseMapper.selectPage(Condition.getPage(query), Wrappers.emptyWrapper()); return BladePage.of(page); } -- Gitblit v1.9.3