Merge branch 'yantai_zhengwu_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -186,6 +186,12 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
 
     @Override
     public PageData<AccountActivityInfo>  getAccountActivityInfo(CountActivityFormDTO formDTO) {
+
+        if (formDTO.getIsPage()) {
+            List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
+            int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();
+            return new PageData<>(accountActivityInfos, total);
+        }
         List<AccountActivityInfo> accountActivityInfos = baseDao.selectListActivityInfo(formDTO);
         int total = CollectionUtils.isEmpty(accountActivityInfos) ? NumConstant.ZERO : accountActivityInfos.size();
         return new PageData<>(accountActivityInfos, total);

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

@@ -176,13 +176,11 @@
                         customer_agency a
                     LEFT JOIN staff_login_log l ON a.ID = l.AGENCY_ID
                     WHERE
-                        a.PIDS LIKE CONCAT(
+                        a.`LEVEL` = 'community'
-                            '%',
-                            #{orgId},
-                            '%'
-                        )
-                    AND a.`LEVEL` = 'community'
                     AND a.DEL_FLAG = '0'
+                    <if test="orgId!= null and orgId.trim() != ''">
+                        AND a.PIDS LIKE CONCAT('%',#{orgId},'%')
+                    </if>
                     GROUP BY
                         a.ID
                 ) t;