Merge remote-tracking branch 'origin/dev'

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

@@ -314,6 +314,7 @@
         INNER JOIN customer_agency ca ON cg.pid = ca.id
         WHERE cg.del_flag = '0'
         AND ca.del_flag = '0'
+        AND cg.SYNC_FLAG='1'
         AND cg.id IN
         <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
             #{id}
@@ -428,6 +429,7 @@
         ) agency ON grid.PID = agency.ID
        WHERE
            grid.del_flag = 0
+           and grid.SYNC_FLAG='1'
             <if test='areaCode != "" and areaCode != null'>
                AND grid.area_code LIKE CONCAT(#{areaCode},'%')
             </if>
@@ -467,6 +469,7 @@
                 ) agency ON a.PID = agency.ID
                 WHERE
                     a.del_flag = 0
+                    and a.SYNC_FLAG='1'
                     AND a.customer_id = #{customerId}
             ) AS c
          ORDER BY  CONVERT ( gridName USING gbk ) ASC

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -132,11 +132,13 @@
             gov_staff_role
         WHERE
             DEL_FLAG = 0
-          AND (
+        <if test="roleIds != null and roleIds.size() > 0">
-              <foreach collection="roleIds" item="roleId" separator=" OR ">
+            AND (
-                  ID = #{roleId}
+            <foreach collection="roleIds" item="roleId" separator=" OR ">
-              </foreach>
+                ID = #{roleId}
+            </foreach>
             )
+        </if>
     </select>
     <select id="getStaffRoles" resultType="com.epmet.entity.GovStaffRoleEntity">
         SELECT