From 40820a8b88163ce59089b9831e0e7ba0bf8cdc7b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 12:41:25 +0800
Subject: [PATCH 1/2] /gov/org/enterprise/list

---
 .../main/resources/mapper/IcEnterpriseDao.xml    | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 235c9e2d70..af1f9bd464 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
@@ -73,12 +73,20 @@
                 <if test='null != orgId and "" != orgId'>
                     AND (ie.AGENCY_ID = #{orgId} or ie.AGENCY_PIDS like concat('%',#{orgId},'%'))
                 </if>
+                <if test='null == orgId or "" == orgId'>
+                    AND (
+                        ie.AGENCY_ID = #{staffAgencyId}
+                        OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
+                    )
+                </if>
             </if>
             <if test='null==orgType or "" == orgType'>
-                AND (
-                    ie.AGENCY_ID = #{staffAgencyId}
-                    OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
-                )
+                <if test='null != staffAgencyId and "" != staffAgencyId'>
+                    AND (
+                        ie.AGENCY_ID = #{staffAgencyId}
+                        OR ie.AGENCY_PIDS LIKE concat( '%', #{staffAgencyId}, '%' )
+                    )
+                </if>
             </if>
             <if test='null != gridId and "" != gridId'>
                 AND ie.GRID_ID = #{gridId}

From 2709356787267f6e886029484e9dd0befc06c8c3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 13 Apr 2023 12:47:29 +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 af1f9bd464..52945262d5 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
@@ -67,7 +67,9 @@
         WHERE
             ie.DEL_FLAG = '0'
             <if test='"grid" == orgType'>
-                AND ie.GRID_ID = #{orgId}
+                <if test='null != orgId and "" != orgId'>
+                    AND ie.GRID_ID = #{orgId}
+                </if>
             </if>
             <if test='"agency" == orgType'>
                 <if test='null != orgId and "" != orgId'>