admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修改-修改密码

Browse Source
This commit is contained in:
guoshengxiong 2024-05-12 17:04:11 +08:00
parent 2abfb5c70a
commit 65cc2ade55
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/basicdata/service/INoticeService.java
View File

@ -16,9 +16,9 @@ public interface INoticeService extends IService<Notice> {
IPage<Notice> selectNoticePageList(Map<String, Object> map); 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); void cleanAllNotice(Map<String, Object> map);

8
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java
View File

@ -69,17 +69,17 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
} }
@Override @Override
public void addNotice(Notice notice, boolean sendNotice) { public void addNotice(Notice notice, boolean isSendMqtt) {
noticeMapper.insert(notice); noticeMapper.insert(notice);
if (sendNotice) { if (isSendMqtt) {
sendPushMessage(notice); sendPushMessage(notice);
} }
} }
@Override @Override
public void addNoticeAndApp(Notice notice, boolean sendNotice) { public void addNoticeAndApp(Notice notice, boolean isSendMqtt) {
noticeMapper.insert(notice); noticeMapper.insert(notice);
if (sendNotice) { if (isSendMqtt) {
sendPushMessage(notice); sendPushMessage(notice);
} }
SystemUser systemUser = systemUserMapper.selectById(notice.getAccountId()); SystemUser systemUser = systemUserMapper.selectById(notice.getAccountId());

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -342,7 +342,8 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
} }
} }
if (systemUser.getAccountType() == 6) { 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)) { if (CollUtil.isNotEmpty(users)) {
systemUser.setPersonMail(users.get(0).getPersonMail()); systemUser.setPersonMail(users.get(0).getPersonMail());
} }

1
src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityInspectionRecordServiceImpl.java
View File

@ -271,6 +271,7 @@ public class QualityInspectionRecordServiceImpl extends ServiceImpl<QualityInspe
if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) { if (qualityInspectionRecord.getRecordType() == 1 && qualityInspectionRecord.getStatus() == 2) {
noticeService.addUserNoticeAndApp(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11", noticeService.addUserNoticeAndApp(qualityInspectionRecord.getChangeId(), "您有一条质量检查待整改，问题：" + qualityInspectionRecord.getDangerItemContent(), "质量管理待整改", "11",
PushPayloads.buildPushPayload(11, qualityInspectionRecord)); PushPayloads.buildPushPayload(11, qualityInspectionRecord));
} }
sanjiangDataCall.sendAddQualityInspectionRecord(qualityInspectionRecord); sanjiangDataCall.sendAddQualityInspectionRecord(qualityInspectionRecord);

2
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzRegistryServiceImpl.java
View File

@ -234,7 +234,7 @@ public class XzRegistryServiceImpl extends ServiceImpl<XzRegistryMapper, XzRegis
} }
email = xzRegistry.getEmail(); email = xzRegistry.getEmail();
} else if (su.getAccountType() == 6) { } 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)) { if (CollUtil.isEmpty(users)) {
throw new OpenAlertException("项目子账号不存在"); throw new OpenAlertException("项目子账号不存在");
} }