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/dto/CodeExportAttrDTO.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
index 4dd340d..8f8ff61 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeExportAttrDTO.java
@@ -46,7 +46,7 @@
     /**
      * 鏌ヨ鏉′欢
      */
-    private Map<String,Object> conditionMap;
+    private Map<String,String> conditionMap;
 
     /**
      * 鍒嗙被鐨勪富閿�
@@ -101,11 +101,11 @@
         this.order = order;
     }
 
-    public Map<String, Object> getConditionMap() {
+    public Map<String, String> getConditionMap() {
         return conditionMap;
     }
 
-    public void setConditionMap(Map<String, Object> conditionMap) {
+    public void setConditionMap(Map<String, String> conditionMap) {
         this.conditionMap = conditionMap;
     }
 

--
Gitblit v1.9.3