From 58300a046625b89070e1639bc7978a0b37d3611a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 12:21:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4agerange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/IcResiUserDao.xml   | 62 ++++++++++++++++---
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index 9b30ddb1a8..f94e97f38a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -127,11 +127,34 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                            </if>
                         </if>
-                        <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                            </if>
+                        </if>
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
                         </if>
                     </if>
 
@@ -189,11 +212,34 @@
                     <if test="subCondition.queryType!= null and subCondition.queryType == 'daterange' ">
                         and ${subCondition.tableName}.${subCondition.columnName} is not null
                         and ${subCondition.tableName}.${subCondition.columnName} !=''
-                        <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                            </if>
+                        </if>
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and ${subCondition.tableName}.${subCondition.columnName} &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                        </if>
+                    </if>
+
+                    <if test="subCondition.queryType!= null and subCondition.queryType == 'agerange' ">
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 2">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
+                            <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &lt;= #{subCondition.columnValue[1]}
+                            </if>
                         </if>
-                        <if test='null != subCondition.columnValue[1] and subCondition.columnValue[1] != "" '>
-                            and ${subCondition.tableName}.${subCondition.columnName} &lt;= #{subCondition.columnValue[1]}
+                        <if test="subCondition.columnValue != null and subCondition.columnValue.size() == 1">
+                            <if test='null != subCondition.columnValue[0] and subCondition.columnValue[0] != "" '>
+                                and YEAR(NOW())-SUBSTR(${subCondition.tableName}.${subCondition.columnName}, 1, 4) &gt;= #{subCondition.columnValue[0]}
+                            </if>
                         </if>
                     </if>
 

From 65cc3a319a2cb5c7e49b4f94602830358a88b8aa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 12:27:59 +0800
Subject: [PATCH 2/2] /gov/org/enterprise/list

---
 .../src/main/resources/mapper/IcEnterpriseDao.xml             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
index 029fb23169..235c9e2d70 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml
@@ -70,7 +70,9 @@
                 AND ie.GRID_ID = #{orgId}
             </if>
             <if test='"agency" == orgType'>
-                AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+                <if test='null != orgId and "" != orgId'>
+                    AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
+                </if>
             </if>
             <if test='null==orgType or "" == orgType'>
                 AND (