diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index 277c0958e..2daf31b12 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -450,9 +450,6 @@
w1.project_sn = #{projectSn}
and w1.inService_type = 1
-
- and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
-
and w1.project_sn in
+
+ AND (FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+
+ OR w1.enterprise_id IN ( SELECT enterprise_id FROM
+ project_enterprise WHERE find_in_set((SELECT id FROM project_enterprise WHERE project_sn =
+ #{projectSn} and enterprise_id = #{userEnterpriseId}), ancestors))
+
+ )
+
and w1.inService_type = 1
-
- and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
-
and w1.project_sn in
+
+ AND (FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+
+ OR w1.enterprise_id IN ( SELECT enterprise_id FROM
+ project_enterprise WHERE find_in_set((SELECT id FROM project_enterprise WHERE project_sn =
+ #{projectSn} and enterprise_id = #{userEnterpriseId}), ancestors))
+
+ )
+
@@ -1077,7 +1089,13 @@
and p.create_time < current_date
- and FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+ AND (FIND_IN_SET(w1.enterprise_id, #{userEnterpriseId})
+
+ OR w1.enterprise_id IN ( SELECT enterprise_id FROM
+ project_enterprise WHERE find_in_set((SELECT id FROM project_enterprise WHERE project_sn =
+ #{projectSn} and enterprise_id = #{userEnterpriseId}), ancestors))
+
+ )
) tp
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index e320b56e0..a1a50a042 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -53,6 +53,7 @@ import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise;
import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo;
import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
+import com.zhgd.xmgl.modules.project.service.IProjectEnterpriseService;
import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
import com.zhgd.xmgl.modules.worker.entity.*;
@@ -264,6 +265,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl map) {
Map data = new HashMap<>(16);
Map personType = new HashMap<>(16);
+ String projectSn = MapUtils.getString(map, "projectSn");
+ String userEnterpriseId = MapUtils.getString(map, "userEnterpriseId");
+ if (StrUtil.isNotBlank(userEnterpriseId)) {
+ ProjectEnterprise enterprise = projectEnterpriseService.getOne(new LambdaQueryWrapper()
+ .eq(ProjectEnterprise::getProjectSn, projectSn)
+ .eq(ProjectEnterprise::getEnterpriseId, userEnterpriseId)
+ );
+ map.put("isMain", Optional.ofNullable(enterprise).map(m -> Objects.equals(m.getParentProjectEnterpriseId(), 0L) ? 1 : 0).orElse(null));
+ }
Map toaltPerson = workerInfoMapper.selectWorkerPersonTypeTotal(map);
Map presencePerson = workerInfoMapper.selectPresenceWorkerPersonTypeTotal(map);
Map attendancePerson = workerInfoMapper.selectAttendanceWorkerPersonTypeTotal(map);
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 907bb84f3..ebacc71fd 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,6 +1,7 @@
#http.port=30250
http.port=12553
-spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/wisdomsite-angang?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
+#spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/wisdomsite-angang?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
+spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/wisdomsite_angang_deploy?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false
spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==)
spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)