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-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
index 72855b5..618790b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSrchCondConfig.java
@@ -1,6 +1,9 @@
 package com.vci.ubcs.code.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -13,13 +16,19 @@
  */
 
 @Data
-@TableName("PL_CODE_SRCHCONDCONFIG")
+@TableName(CodeTableNameConstant.PL_CODE_SRCHCONDCONFIG)
 @ApiModel(value = "CodeSrchCondConfig瀵硅薄", description = "缂栫爜瑙勫垯绠$悊-寮曠敤鐮佹-鍙傜収閰嶇疆-鎼滅储鏉′欢閰嶇疆")
-public class CodeSrchCondConfig extends BaseModel {
+public class CodeSrchCondConfig {
 
 	private static final long serialVersionUID = -51655155561881523L;
 
 	/**
+	 * 涓婚敭
+	 */
+	@TableId(value = "OID",type = IdType.ASSIGN_UUID)
+	private String oid;
+
+	/**
 	 * 绛涢�夊瓧娈�
 	 */
 	private String filterField;

--
Gitblit v1.9.3