From 17dc74a722d4b9e441c0db65ff6ed67df8df5a09 Mon Sep 17 00:00:00 2001
From: gonglilong <328255720@qq.com>
Date: Sat, 14 Sep 2024 22:36:06 +0800
Subject: [PATCH] 加上县级单位过滤

---
 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java |    2 +-
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
index 0b7b3be..8f47278 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DO/SgProgressReportDO.java
@@ -163,7 +163,7 @@
 	private String selfUnit;
 
 	@TableField(exist = false)
-	private String countyUnit;
+	private String countryUnit;
 
 	@TableField(exist = false)
 	private String countyCd;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
index ae84df6..4107f18 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -99,7 +99,7 @@
         <if test="dto.userUnit != null and dto.userUnit != ''">
             and  si.CONTROL_UNIT=#{dto.userUnit}
         </if>
-        <if test="dto.countyUnit != null and dto.countyUnit != ''">
+        <if test="dto.countryUnit != null and dto.countryUnit != ''">
             and dria."county_cd"=#{dto.userUnit}
         </if>
         <if test="dto.roleUnit != null and dto.roleUnit != ''">

--
Gitblit v1.9.3