elink-star
/
epmet-cloud-lingshan
forked from luyan/epmet-cloud-lingshan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
yinzuomei 5 years ago
parent
69263c91a6 3094609b8d
commit
67f1806a14
1 changed files with 2 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

3
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
View File

@ -160,7 +160,8 @@
bo.ORG_ID AS agencyId, bo.ORG_ID AS agencyId,
sca.agency_name AS name, sca.agency_name AS name,
IFNULL(sca.area_marks,'') AS areaMarks, IFNULL(sca.area_marks,'') AS areaMarks,
sca.level AS level sca.level AS level,
sca.level as agencyLevel
FROM FROM
screen_customer_agency sca screen_customer_agency sca
LEFT JOIN screen_customer_biz_org bo ON bo.ORG_ID = sca.AGENCY_ID LEFT JOIN screen_customer_biz_org bo ON bo.ORG_ID = sca.AGENCY_ID

Write Preview
Loading…
Cancel
Save