From b6c4b380aba5f20304ded528bb9c44cc8c284121 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Mon, 29 Apr 2024 23:48:03 +0800
Subject: [PATCH] update code

---
 .../bigscreen/web/controller/ProjectAttendanceController.java  | 2 +-
 .../mapper/project/SurProjectAttendanceDataMapper.xml          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
index b8ffad5e..0fa26b11 100644
--- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
+++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectAttendanceController.java
@@ -155,7 +155,7 @@ public class ProjectAttendanceController extends BaseController {
                 where.setPrjIds(getProjectIds());
             }
         }
-        String key="bgscreen_attendance_groupAllByComany-"+where.getDeptId()+"-"+where.getSubDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
+        String key="bgscreen_attendance_groupAllByComany-"+where.getId()+"-"+where.getDeptId()+"-"+where.getSubDeptId()+"_"+where.getProjectId()+"_"+where.getProType()+Md5Utils.hash(where.getPrjIds());
         Object obj=redisCache.getCacheObject(key);
         if(obj!=null){
             return AjaxResult.success(obj);
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
index 96f1ad66..f4872092 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAttendanceDataMapper.xml
@@ -356,7 +356,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select g.companyTypeId,count(1) id
         from sur_project_attendance_user u, sur_project_attendance_cfg c,view_sur_project_attendance_group g,
              sur_project sp
-        where u.cfgid=c.id and u.state=0 and u.companyId=g.companyId and u.state=0 and c.project_id = sp.id
+        where u.cfgid=c.id and u.companyId=g.companyId and u.state=#{id} and c.project_id = sp.id
           and sp.isDel=0 and sp.progressVisible=0
         and g.companyTypeId in (0,1,2,3,4,5,6,8)
         <if test="projectId!=null and projectId>0">
@@ -368,6 +368,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
         <if test="prjIds !=null and prjIds.size()>0">
             and c.project_id in
+                
             <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
                 #{item}
             </foreach>