修复活跃社区与不活跃社区统计中忘记加时间限制的bug

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

@@ -215,9 +215,20 @@
         WHERE
         a.`LEVEL` = 'community'
         AND a.DEL_FLAG = '0'
-                    <if test="orgId!= null and orgId.trim() != ''">
-                        AND a.PIDS LIKE CONCAT('%',#{orgId},'%')
+        <if test='null != startDate'>
+            and l.LOGIN_TIME &gt;= #{startDate}
         </if>
+        <if test='null != endDate'>
+            and l.LOGIN_TIME &lt;= #{endDate}
+        </if>
+        <choose >
+            <when test='isActivity!= null and isActivity == "1" and isActivity.trim() != ""'>
+                AND  l.AGENCY_ID is NOT NULL
+            </when>
+            <otherwise>
+                AND  l.AGENCY_ID is  NULL
+            </otherwise>
+        </choose>
         GROUP BY
         a.ID
         ) t;