From 45013d350be279500d83d537423d193123c56a98 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 30 Apr 2025 15:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java     | 6 ++++--
 .../src/main/resources/application-dev.yml                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java
index 4175a8f..463b14e 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/xxhbjwxtjxrw/controller/XxhbjwxtjxrwController.java
@@ -237,8 +237,10 @@ public class XxhbjwxtjxrwController extends JeecgController<Xxhbjwxtjxrw, IXxhbj
 		 if(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq())){
 			 queryWrapper.eq(StringUtils.isNotBlank(xxhbjwxtjxrw.getZjxnxq()),"concat(xn,xqmc)",xxhbjwxtjxrw.getZjxnxq());
 		 }else if(StringUtils.equals(xnxq,"0")){
-			 String dqxq = commonApi.translateDict("dqxq","1");
-			 queryWrapper.eq("concat(xn,xqmc)",dqxq);
+			 if(StringUtils.isEmpty(xxhbjwxtjxrw.getXn())){
+				 String dqxq = commonApi.translateDict("dqxq","1");
+				 queryWrapper.eq("concat(xn,xqmc)",dqxq);
+			 }
 		 }
 
 
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
index 8455b79..3666b74 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml
@@ -179,7 +179,7 @@ spring:
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 0
+    database: 3
     host: 127.0.0.1
     port: 6379
     password: ''