diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeController.java
index 6c4bdc189..113c6b063 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeController.java
@@ -74,7 +74,8 @@ public class NoticeController {
             @ApiImplicitParam(name = "accountId", value = "通知人", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "notInType", value = "除了某些类型，多个逗号分隔（比如除了质量、安全类型，传 10,11 ）", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "notInType", value = "除了某些类型，多个逗号分隔（比如除了质量、安全类型，传 10,11 ）", paramType = "body", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "isBigScreen", value = "1是大屏", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping(value = "/list")
 	public Result<IPage<Notice>> queryPageList(@RequestBody Map<String,Object> map) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
index cc12159a3..f2cbe8c57 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
@@ -142,11 +142,10 @@ public class SystemUserController {
     @ApiOperation(value = "根据企业或项目SN查找账号列表", notes = "根据企业或项目SN查找账号列表", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"),
-            @ApiImplicitParam(name = "type", required = true, value = "1=默认，2查询项目账号和新用户", paramType = "body"),
     })
     @PostMapping(value = "/getSystemUserBySn")
     public Result<List<SystemUser>> getSystemUserBySn(@RequestBody Map<String, Object> map) {
-        return Result.success(systemUserService.getSystemUserBySn(map));
+        return Result.success(systemUserService.getSystemUsersBySn(map));
     }
 
     @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表1", httpMethod = "POST")
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Notice.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Notice.java
index db78741fd..2730c91e1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Notice.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/Notice.java
@@ -30,7 +30,7 @@ public class Notice implements Serializable {
     private java.lang.Long id;
     @ApiModelProperty(value = "类型，1考勤提醒，2人员报警,3车辆，4混凝土监测，5卸料平台，6配电箱，7扬尘,8视频，9标养室,10安全检查,11质量检查,12塔吊,13升降机," +
             "14电表,15水表,16访客,17,防疫人员通知，18访客通知,19巡检点,20人员的资质证书即将到期,21人员的合同信息即将到期，22人员的保险信息即将到期," +
-            "23同步人员到海康isc,24同步车辆到海康isc,25同步组织到海康isc 30工作流审批通知")
+            "23同步人员到海康isc,24同步车辆到海康isc,25同步组织到海康isc 30工作流审批通知，31大屏的安全和质量")
     private java.lang.String type;
     /**
      * 消息内容
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
index eef4d9d7a..62228dcd8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemUser.java
@@ -191,4 +191,7 @@ public class SystemUser implements Serializable {
     @TableField(exist = false)
     private java.lang.Long enterpriseId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "邮箱")
+    private java.lang.String personMail;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
index 76069e9b1..78d0dda01 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java
@@ -32,6 +32,10 @@ public interface SystemUserMapper extends BaseMapper<SystemUser> {
 
     List<SystemUser> getSystemUserBySn(@Param("param") Map<String, Object> map);
 
+    Page<SystemUser> getSystemUserBySn(@Param("param") Map<String, Object> map, Page<SystemUser> page);
+
+    List<SystemUser> getSystemUsers(@Param("param") Map<String, Object> map);
+
     SystemUser findByUsername(@Param("account") String account);
 
     List<SystemUser> getComapnySystemUserList(Map<String, Object> map);
@@ -107,8 +111,6 @@ public interface SystemUserMapper extends BaseMapper<SystemUser> {
             " WHERE w.worker_name LIKE '%${py}%' AND w.project_sn = #{projectSn}")
     List<OrgTreeVo> selectUsersByPy(@Param("py") String py, @Param("projectSn") String projectSn);
 
-    Page<SystemUser> getSystemUserBySn(@Param("p") Map<String, Object> map, Page<SystemUser> page);
-
     Page<SystemUser> getTenantListBySn(@Param("map") Map<String, Object> map, Page page);
 
     List<SystemUser> getUsersByRegionId(Long id);
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
index 578de3eea..7a857167e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
@@ -1,32 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.zhgd.xmgl.modules.basicdata.mapper.NoticeMapper">
-
-
     <select id="selectNoticePageList" resultType="com.zhgd.xmgl.modules.basicdata.entity.Notice">
         SELECT *
         FROM notice
-        WHERE account_id=#{param.accountId}
-        <if test="param.sendTime!=null and param.sendTime!=''">
-            AND DATE_FORMAT(#{send_time},'%Y-%m-%d')=DATE_FORMAT(#{param.sendTime},'%Y-%m-%d')
+        WHERE account_id = #{param.accountId}
+        <if test="param.sendTime != null and param.sendTime != ''">
+            AND DATE_FORMAT(#{send_time}, '%Y-%m-%d') = DATE_FORMAT(#{param.sendTime}, '%Y-%m-%d')
         </if>
-        <if test="param.title!=null and param.title!=''">
-            and title like CONCAT(CONCAT('%',#{param.title}),'%')
+        <if test="param.title != null and param.title != ''">
+            and title like CONCAT(CONCAT('%', #{param.title}), '%')
         </if>
         <if test="param.type != null and param.type != ''">
-            and type=#{param.type}
+            and type = #{param.type}
         </if>
         <if test="param.startTime != null and param.startTime != ''">
-            AND send_time &gt;=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00')
+            AND send_time &gt;= CONCAT(DATE_FORMAT(#{param.startTime}, '%Y-%m-%d'), ' 00:00:00')
         </if>
         <if test="param.endTime != null and param.endTime != ''">
-            AND send_time &lt;=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59')
+            AND send_time &lt;= CONCAT(DATE_FORMAT(#{param.endTime}, '%Y-%m-%d'), ' 23:59:59')
         </if>
         <if test="param.isRead != null and param.isRead != ''or param.isRead == '0'.toString()">
-            AND is_read=#{param.isRead}
+            AND is_read = #{param.isRead}
         </if>
         <if test="param.notInType != null and param.notInType != ''">
-            AND not find_in_set(type,#{param.notInType})
+            AND not find_in_set(type, #{param.notInType})
+        </if>
+        <if test="param.isBigScreen == null or param.isBigScreen == '0'.toString()">
+            AND type != 31
+        </if>
+        <if test="param.isBigScreen == '1'.toString()">
+            AND type = 31
         </if>
         ORDER BY send_time DESC
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
index 22a57e889..42a888f9a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
@@ -6,20 +6,31 @@
         from system_user a
         LEFT JOIN organization_job jb ON a.job_id = jb.id
         WHERE a.sn = #{param.sn}
+        and a.account_type in (1, 2, 3, 4, 5, 7)
+    </select>
+    <select id="getSystemUsers" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser" parameterType="map">
+        SELECT a.*, jb.job_name
+        from system_user a
+        LEFT JOIN organization_job jb ON a.job_id = jb.id
+        WHERE 1=1
         <if test="param.type == '1'.toString()">
+            and a.sn = #{param.sn}
             and a.account_type in (1, 2, 3, 4, 5, 7)
         </if>
-        <if test="param.type == '2'.toString()">
-            and a.account_type in (5)
+        <if test="param.accountType != null and param.accountType != ''">
+            and a.account_type = #{param.accountType}
         </if>
         <if test="param.type == '3'.toString()">
-            and ( a.account_type = 5 or ( a.account_type = 10 and a.user_id in (select distinct t.user_id from
+            and ((a.account_type = 5 and a.sn = #{param.sn}) or ( a.account_type = 10 and a.user_id in (select distinct
+            t.user_id from
             xz_system_user_to_company_project t where a.user_id = t.user_id and t.type = 2 and t.sn = #{param.sn})))
         </if>
     </select>
+
     <select id="getProjectChilderSystemUserList" resultType="com.zhgd.xmgl.modules.basicdata.entity.SystemUser"
             parameterType="map">
-        SELECT a.worker_id as id, a.*, c.role_name, d.worker_name, b.role_id,po.dept_name projectOrgName,d.enterprise_id
+        SELECT a.worker_id as id, a.*, c.role_name, d.worker_name, b.role_id,po.dept_name
+        projectOrgName,d.enterprise_id,d.person_mail
         from system_user a
         LEFT JOIN base_role_user b ON a.user_id = b.user_id
         LEFT JOIN base_role c ON c.role_id = b.role_id
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
index 204525bf5..7cd68c40e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserService.java
@@ -31,10 +31,11 @@ public interface ISystemUserService extends IService<SystemUser> {
     /**
      * 根据企业或项目SN查找账号列表
      *
-     * @param map
+     * @param sn
+     * @param type 3 项目级别账号
      * @return
      */
-    List<SystemUser> getSystemUserBySn(Map<String, Object> map);
+    List<SystemUser> getSystemUsersBySn(Map<String, Object> map);
 
     Long saveSystemUser(SystemUser systemUser);
 
@@ -95,6 +96,8 @@ public interface ISystemUserService extends IService<SystemUser> {
 
     Page<SystemUser> getSystemUserBySnPage(Map<String, Object> map);
 
+    List<SystemUser> getSystemUsers(Map<String, Object> map);
+
     Map<String, Object> deviceLogin(Map<String, Object> map);
 
     /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
index 4cd90e5f8..228b9422a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java
@@ -198,7 +198,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         map.put("companyType", "4");
         List<EntityMap> list = companyMapper.getChildCompanyList(map);
         List<EntityMap> projectList = projectMapper.getProjectListBySn(map);
-        map.put("type", 1);
         List<SystemUser> sysList1 = systemUserMapper.getSystemUserBySn(map);
         List<SystemUser> sysList2 = systemUserMapper.getChildComapnySystemUserList(map);
         List<SystemUser> sysList3 = systemUserMapper.getChildComapnyProjectSystemUserList(map);
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 7c6d12ad2..ff1694c75 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -165,6 +165,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                     .eq(SystemUser::getAccount, account);
             SystemUser systemUser = systemUserMapper.selectOne(queryWrapper);
 
+
             String password = MapUtils.getString(map, "password");
             log.info(password);
             log.info(passwordEncoder.encode(password));
@@ -252,78 +253,9 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
 
         if ((Objects.equals(systemUser.getAccountType(), 10) || Objects.equals(systemUser.getAccountType(), 11)) &&
                 StringUtils.isBlank(MapUtils.getString(map, "headquartersSn"))) {
-            //新用户和供应商
-            //CompanyConfig companyConfig = null;
-            //if (systemUser.getAccountType() == 1) {
-            //    companyConfig = new CompanyConfig();
-            //    companyConfig.setIsEnable(1);
-            //    companyConfig.setEffectiveTime(60 * 60 * 24);
-            //    companyConfig.setDiffDay(20);
-            //    companyConfig.setModuleShowType(0);
-            //    companyConfig.setMobileAttendance(0);
-            //    companyConfig.setProjectKanban(0);
-            //    companyConfig.setCompanyBigScreen(0);
-            //    companyConfig.setInputQrCode(0);
-            //    companyConfig.setStyleType(1);
-            //    companyConfig.setEnterProjectBackType(0);
-            //    companyConfig.setExpireTime(DateUtil.format(DateUtil.tomorrow(), DatePattern.NORM_DATE_PATTERN));
-            //    companyConfig.setAddProjectType(0);
-            //    companyConfig.setStyleType(1);
-            //    companyConfig.setHeadquartersSn("-1");
-            //} else if (systemUser.getAccountType() == 5 || systemUser.getAccountType() == 6) {
-            //    companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
-            //} else if (systemUser.getAccountType() == 10 || systemUser.getAccountType() == 11) {
-            //
-            //    companyConfig = companyConfigMapper.getCompanyConfigByProject(systemUser.getSn());
-            //} else {
-            //    companyConfig = companyConfigMapper.getCompanyConfigBySN(systemUser.getSn());
-            //}
-            //log.info("companyConfig：{}", JSON.toJSONString(companyConfig));
-            //if (companyConfig.getExpireTime() == null) {
-            //    throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
-            //} else {
-            //    DateTime expireTime = DateUtil.parse(companyConfig.getExpireTime(), "yyyy-MM-dd");
-            //    DateTime currentDate = new DateTime();
-            //
-            //    if (expireTime.getTime() < currentDate.getTime()) {
-            //        throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
-            //    } else {
-            //        companyConfig.setDiffDay((int) DateUtil.between(currentDate, DateUtil.offset(expireTime, DateField.DAY_OF_MONTH, 1), DateUnit.DAY));
-            //    }
-            //}
-            //
-            //
-            //if (companyConfig == null || companyConfig.getIsEnable() == 0) {
-            //    throw new OpenAlertException(MessageUtil.get("loginEnabledErr"));
-            //}
-            //if (companyConfig.getDiffDay() == 0) {
-            //    throw new OpenAlertException(MessageUtil.get("loginExpiredErr"));
-            //}
-            //if (companyConfig.getEffectiveTime() == null) {
-            //    companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
-            //}
-            //SystemLogoConfig slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, companyConfig.getHeadquartersSn()));
-            //if (slc == null) {
-            //    slc = systemLogoConfigMapper.selectOne(new LambdaQueryWrapper<SystemLogoConfig>().eq(SystemLogoConfig::getHeadquartersSn, "-1"));
-            //}
             String token = jwtTokenProvider.createToken(MapUtils.getString(map, "account"), 60 * 60 * 24 * 30 * 12, 0);
-            //UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
-            //if (userEnterprise != null) {
-            //    result.put("userEnterpriseId", userEnterprise.getEnterpriseId());
-            //} else {
             result.put("userEnterpriseId", "");
-            //}
-            //if (systemUser.getAccountType() == 6) {
-            //    //项目子账号要判断是否能查看设备中台
-            //    BaseRole baseRole = baseRoleMapper.selectRoleByUserId(systemUser.getUserId());
-            //    if (baseRole == null) {
-            //        result.put("seeEquipment", 1);
-            //    } else {
-            //        result.put("seeEquipment", Integer.valueOf(baseRole.getSeeEquipment()));
-            //    }
-            //} else {
             result.put("seeEquipment", 0);
-            //}
             result.put("token", token);
             if (systemUser != null && systemUser.getUserId() != null) {
                 result.put("userId", systemUser.getUserId().toString());
@@ -352,7 +284,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             result.put("addProjectType", null);
             result.put("enterProjectBackType", null);
             result.put("companyBigScreen", null);
-            //Map<String, Object> menuAuthority = getUserAuthority(systemUser.getUserId(), systemUser.getAccountType(), systemUser.getSn(), companyConfig.getHeadquartersSn(), companyConfig.getStyleType());
             Map<String, Object> menuAuthority = new HashMap<>();
             menuAuthority.put("moduleList", new ArrayList<>());
             menuAuthority.put("menuList", new ArrayList<>());
@@ -360,6 +291,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             result.put("scope", scope);
             result.put("expire", false);
             result.put("systemLogoConfig", new SystemLogoConfig());
+            result.put("personMail", systemUser.getPersonMail());
             if (Objects.equals(systemUser.getAccountType(), 10)) {
                 XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
                         .eq(XzSystemUserToCompanyProject::getType, 2)
@@ -475,6 +407,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             result.put("scope", scope);
             result.put("expire", false);
             result.put("systemLogoConfig", slc);
+            result.put("personMail", systemUser.getPersonMail());
             if (Objects.equals(systemUser.getAccountType(), 10)) {
                 XzSystemUserToCompanyProject xzSystemUserToCompanyProject = xzSystemUserToCompanyProjectMapper.selectOne(new LambdaQueryWrapper<XzSystemUserToCompanyProject>()
                         .eq(XzSystemUserToCompanyProject::getType, 2)
@@ -784,8 +717,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
     }
 
     @Override
-    public List<SystemUser> getSystemUserBySn(Map<String, Object> map) {
-        map.put("type", 1);
+    public List<SystemUser> getSystemUsersBySn(Map<String, Object> map) {
         return systemUserMapper.getSystemUserBySn(map);
     }
 
@@ -1482,6 +1414,11 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         return systemUserMapper.getSystemUserBySn(map, page);
     }
 
+    @Override
+    public List<SystemUser> getSystemUsers(Map<String, Object> map) {
+        return systemUserMapper.getSystemUsers(map);
+    }
+
     @Override
     public Map<String, Object> deviceLogin(Map<String, Object> map) {
         Integer type = MapUtils.getInteger(map, "type");
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
index a6efdc9ef..25e7d910f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
@@ -47,14 +47,10 @@ import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.xz.entity.XzAiDeductRule;
 import com.zhgd.xmgl.modules.xz.entity.XzDeductScoreRecord;
 import com.zhgd.xmgl.modules.xz.mapper.XzDeductScoreRecordMapper;
-import com.zhgd.xmgl.modules.xz.security.entity.XzSecurityQualityInspectionRecord;
 import com.zhgd.xmgl.modules.xz.service.impl.XzAiDeductRuleServiceImpl;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
-import com.zhgd.xmgl.util.DateUtils;
-import com.zhgd.xmgl.util.JinqianmaoUtil;
-import com.zhgd.xmgl.util.MessageUtil;
-import com.zhgd.xmgl.util.UrlUtil;
+import com.zhgd.xmgl.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -78,7 +74,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnalyseHardWareAlarmRecordMapper, AiAnalyseHardWareAlarmRecord> implements IAiAnalyseHardWareAlarmRecordService {
     @Autowired
-    AiAnalyseHardWareRecordServiceImpl noAiAnalyseHardWareRecordService;
+    AiAnalyseHardWareRecordServiceImpl aiAnalyseHardWareRecordService;
     @Autowired
     NoticeServiceImpl noticeService;
     @Autowired
@@ -529,7 +525,7 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
 
                     UserInfo user = SecurityUtils.getUser();
                     if (user != null) {
-                        List<String> noticeUserIds = noAiAnalyseHardWareRecordService.getUserIdsByAiAnalyseHardId(taskProgressMaterialRel.getHardwareId());
+                        List<String> noticeUserIds = aiAnalyseHardWareRecordService.getUserIdsByAiAnalyseHardId(taskProgressMaterialRel.getHardwareId());
                         for (String noticeUserId : noticeUserIds) {
                             noticeService.addUserNotice(Long.valueOf(noticeUserId), vo.getDeductReason(), "Al违章扣分通知", "8");
                         }
@@ -597,10 +593,14 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
 
         UserInfo user = SecurityUtils.getUser();
         if (user != null) {
-            List<String> noticeUserIds = noAiAnalyseHardWareRecordService.getUserIdsByAiAnalyseHardId(record.getHardwareId());
+            List<String> noticeUserIds = aiAnalyseHardWareRecordService.getUserIdsByAiAnalyseHardId(record.getHardwareId());
             for (String noticeUserId : noticeUserIds) {
                 noticeService.addUserNotice(Long.valueOf(noticeUserId), "您有一条AI预警数据需要处置，请及时查看。", "AI预警通知", "8");
             }
+            List<SystemUser> users = systemUserService.getSystemUsers(new MapParamBuilder<String, Object>().put("type", 3).put("sn", record.getProjectSn()).build());
+            for (SystemUser systemUser : users) {
+                noticeService.addUserNotice(systemUser.getUserId(), "有一条AI预警数据已处置推送", "AI预警通知", "8");
+            }
         }
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
index 3383b02b0..135dc6fe8 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/controller/XzSecurityQualityInspectionRecordController.java
@@ -89,6 +89,7 @@ public class XzSecurityQualityInspectionRecordController {
             @ApiImplicitParam(name = "enumType", value = "问题等级，1重大隐患，2较大隐患，3一般隐患，4低隐患", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "isNotQualified", value = "是否未销项", paramType = "body", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "isOverdueRectification", value = "是否超期未整改1是", paramType = "body", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "enterpriseId", value = "合作单位id", paramType = "body", required = false, dataType = "String"),
     })
     @PostMapping(value = {"/list", "/page"})
     public Result<XzSecurityRecordVo> queryPageList(@RequestBody Map<String, Object> map) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
index 2ec332253..8c43686c0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/mapper/xml/XzSecurityQualityInspectionRecordMapper.xml
@@ -86,6 +86,9 @@
         LEFT join subdivision_project subentry on subentry.id = a.subentry_id
         LEFT join dangerous_engineering_record der on der.id = a.engineering_id
         WHERE a.project_sn = #{param.projectSn}
+        <if test="param.enterpriseId != null and param.enterpriseId != ''">
+            and a.enterprise_id = #{param.enterpriseId}
+        </if>
         <if test="param.isOverdueRectification == '1'.toString()">
             and (a.status = 2 AND now() > a.change_limit_time)
         </if>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1017921ff..389b2ce4d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -134,7 +134,7 @@ redisson.codec=org.redisson.codec.JsonJacksonCodec
 redisson.threads=4
 redisson.netty.threads=4
 redisson.single-server-config.address=redis://${spring.redis.host}:${spring.redis.port}
-#redisson.single-server-config.password=null
+#redisson.single-server-config.password=${spring.redis.password}
 #redisson.single-server-config.database=0
 # spring  boot admin 所在服务器
 spring.boot.admin.client.url=http://localhost:9091