Merge remote-tracking branch 'origin/yantai_zhengwu_master' into dev

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcEnterpriseDao.xml

@@ -67,19 +67,29 @@
         WHERE
             ie.DEL_FLAG = '0'
             <if test='"grid" == orgType'>
+                <if test='null != orgId and "" != orgId'>
                     AND ie.GRID_ID = #{orgId}
                 </if>
+            </if>
             <if test='"agency" == orgType'>
                 <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'>
+                <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}
             </if>