投票增加分页,工作台面板优化

cloud-site-service/src/main/resources/mapper/EventTrackMapper.xml

@@ -72,6 +72,7 @@
         where e.deleted =0
         where e.deleted =0
         and e.dept_id in (SELECT id FROM cloud_system.authz_user_group where site_id = #{siteId})
         and e.dept_id in (SELECT id FROM cloud_system.authz_user_group where site_id = #{siteId})
         AND (e.type IN (3,14) or ( e.type in (13) and e.remark2 = 1))
         AND (e.type IN (3,14) or ( e.type in (13) and e.remark2 = 1))
+        AND e.business_id in (select id from cloud_trainning_project.training_project  tvr where  tvr.status=1 and tvr.deleted=0)
         <if test="deptId!=null">
         <if test="deptId!=null">
             and e.dept_id = #{deptId}
             and e.dept_id = #{deptId}
         </if>
         </if>
@@ -356,7 +357,7 @@
         SELECT agm.group_id AS subType,count(*) AS num
         SELECT agm.group_id AS subType,count(*) AS num
         FROM cloud_trainning_project.training_project tvr
         FROM cloud_trainning_project.training_project tvr
         INNER JOIN cloud_system.authz_group_member agm ON agm.member_id=tvr.org_id AND agm.deleted = 0
         INNER JOIN cloud_system.authz_group_member agm ON agm.member_id=tvr.org_id AND agm.deleted = 0
-        WHERE tvr.deleted=0
+        WHERE tvr.status = 1 and tvr.deleted=0
         GROUP BY agm.group_id
         GROUP BY agm.group_id
     </select>
     </select>