Merge remote-tracking branch 'origin/dev_pyscreen' into dev_temp

5 years ago · 4a323725c1
2 changed files with 2 additions and 2 deletions
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@ -298,7 +298,7 @@
                    and m.AREA_CODE=#{areaCode}
                </when>
                <otherwise>
-                    m.PARENT_AGENCY_ID=#{agencyId}
+                    and m.PARENT_AGENCY_ID=#{agencyId}
                </otherwise>
            </choose>
    </select>
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@ -133,7 +133,7 @@
                and m.AREA_CODE=#{areaCode}
            </when>
            <otherwise>
-                m.PARENT_AGENCY_ID=#{agencyId}
+                and m.PARENT_AGENCY_ID=#{agencyId}
            </otherwise>
        </choose>
    </select>