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/controller/CodeRuleController.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java index c0225e1..e49b382 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java @@ -29,6 +29,7 @@ import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject; import com.vci.ubcs.starter.web.util.VciBaseUtil; +import com.vci.ubcs.system.user.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -40,6 +41,7 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.constant.BladeConstant; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -214,4 +216,17 @@ return codeRuleService.clearAllCode(oid); } + /** + * 妫�鏌ョ浉浼肩紪鐮佽鍒� + * @param oid + * @return 鎵ц缁撴灉 + */ + @GetMapping("/checkLikeCodeRule") + @ApiOperationSupport(order = 15) + @ApiOperation(value = "妫�鏌ョ浉浼肩紪鐮佽鍒�", notes = "浼犲叆oid") + public R checkLikeCodeRule(@Valid @RequestParam String oid){ + return codeRuleService.checkLikeCodeRule(oid); + } + + } -- Gitblit v1.9.3