Merge branch 'yantai_zhengwu_master'

2 years ago · 3c433bb37a
1 changed files with 4 additions and 1 deletions
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml
@ -92,7 +92,10 @@
        COUNT(DISTINCT(l.STAFF_ID)) accountActivityCount,
        COUNT(DISTINCT(ag.USER_ID)) accountCount,
        a.ID agencyId,
-        CONCAT(a.ALL_PARENT_NAME,a.ORGANIZATION_NAME)  agencyName
+        CONCAT(
        a.ALL_PARENT_NAME,'-',
        a.ORGANIZATION_NAME
        ) agencyName
        FROM
        customer_agency a
        LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID