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

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

@@ -110,8 +110,7 @@
             LEFT JOIN customer_agency ca
             ON (cg.PID = CA.ID)
         WHERE
-            CG.CUSTOMER_ID =#{customerId}
+             cg.id = #{gridId}
-            and cg.id = #{gridId}
     </select>
 
     <select id="getCustomerStaffGridList" resultType="com.epmet.dto.org.CustomerStaffGridDTO">