From 65cc2ade55323b124c41b91776af4e27bc08e06a Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Sun, 12 May 2024 17:04:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/basicdata/service/INoticeService.java    | 4 ++--
 .../modules/basicdata/service/impl/NoticeServiceImpl.java | 8 ++++----
 .../basicdata/service/impl/SystemUserServiceImpl.java     | 3 ++-
 .../service/impl/QualityInspectionRecordServiceImpl.java  | 1 +
 .../modules/xz/service/impl/XzRegistryServiceImpl.java    | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/INoticeService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/INoticeService.java
index a7d265495..eb7835ff0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/INoticeService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/INoticeService.java
@@ -16,9 +16,9 @@ public interface INoticeService extends IService<Notice> {
 
     IPage<Notice> selectNoticePageList(Map<String, Object> map);
 
-    void addNotice(Notice notice, boolean sendNotice);
+    void addNotice(Notice notice, boolean isSendMqtt);
 
-    void addNoticeAndApp(Notice notice, boolean sendNotice);
+    void addNoticeAndApp(Notice notice, boolean isSendMqtt);
 
     void cleanAllNotice(Map<String, Object> map);
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java
index a8aaa262d..117d63ea5 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java
@@ -69,17 +69,17 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     }
 
     @Override
-    public void addNotice(Notice notice, boolean sendNotice) {
+    public void addNotice(Notice notice, boolean isSendMqtt) {
         noticeMapper.insert(notice);
-        if (sendNotice) {
+        if (isSendMqtt) {
             sendPushMessage(notice);
         }
     }
 
     @Override
-    public void addNoticeAndApp(Notice notice, boolean sendNotice) {
+    public void addNoticeAndApp(Notice notice, boolean isSendMqtt) {
         noticeMapper.insert(notice);
-        if (sendNotice) {
+        if (isSendMqtt) {
             sendPushMessage(notice);
         }
         SystemUser systemUser = systemUserMapper.selectById(notice.getAccountId());
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 473de93a6..a3d3ca673 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
@@ -342,7 +342,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                 }
             }
             if (systemUser.getAccountType() == 6) {
-                List<SystemUser> users = getProjectChilderSystemUserList(new MapBuilder<String, Object>().put("projectSn", systemUser.getSn()).build());
+                List<SystemUser> users = getProjectChilderSystemUserList(new MapBuilder<String, Object>().put("projectSn", systemUser.getSn())
+                        .put("userId", systemUser.getUserId()).build());
                 if (CollUtil.isNotEmpty(users)) {
                     systemUser.setPersonMail(users.get(0).getPersonMail());
                 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
index 848b3f4d1..04dc0f9fe 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
@@ -271,6 +271,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
         if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) {
             noticeService.addUserNoticeAndApp(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11",
                     PushPayloads.buildPushPayload(11, qualityInspectionRecord));
+
         }
 
         sanjiangDataCall.sendAddQualityInspectionRecord(qualityInspectionRecord);
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
index 4cd8b7445..4eee76c51 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
@@ -234,7 +234,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
             }
             email = xzRegistry.getEmail();
         } else if (su.getAccountType() == 6) {
-            List<SystemUser> users = systemUserService.getProjectChilderSystemUserList(new MapBuilder<String, Object>().put("projectSn", su.getSn()).build());
+            List<SystemUser> users = systemUserService.getProjectChilderSystemUserList(new MapBuilder<String, Object>().put("projectSn", su.getSn()).put("userId", su.getUserId()).build());
             if (CollUtil.isEmpty(users)) {
                 throw new OpenAlertException("项目子账号不存在");
             }