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

应急bug修复

Browse Source
This commit is contained in:
GUO 2024-05-20 20:47:34 +08:00
parent c8eb09de4e
commit a2b2e87e73
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/zhgd/xmgl/modules/xz/emergency/service/impl/XzEmergencyRecordServiceImpl.java
View File

@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.modules.basicdata.entity.SystemUser;
import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl; import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo;
@ -86,7 +85,7 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
String alarmPersonName = MapUtils.getString(paramMap, "alarmPersonName"); String alarmPersonName = MapUtils.getString(paramMap, "alarmPersonName");
String projectSn = MapUtils.getString(paramMap, "projectSn"); String projectSn = MapUtils.getString(paramMap, "projectSn");
//项目子账号只能看到自己的负责的企业 //项目子账号只能看到自己的负责的企业
querySelfEnterpriseIfSub(enterpriseId, projectSn); querySelfEnterpriseIfSub(queryWrapper);
if (StrUtil.isNotBlank(enterpriseId)) { if (StrUtil.isNotBlank(enterpriseId)) {
queryWrapper.eq("ei.id", enterpriseId); queryWrapper.eq("ei.id", enterpriseId);
} }
@ -97,30 +96,11 @@ public class XzEmergencyRecordServiceImpl extends ServiceImpl<XzEmergencyRecordM
return queryWrapper; return queryWrapper;
} }
private String querySelfEnterpriseIfSub(String enterpriseId, String projectSn) { private void querySelfEnterpriseIfSub(QueryWrapper<XzEmergencyRecord> queryWrapper) {
UserInfo user = SecurityUtils.getUser(); UserInfo user = SecurityUtils.getUser();
if (user.getAccountType() == 6) { if (user.getAccountType() == 6) {
List<SystemUser> systemUserList = systemUserService.getProjectChilderSystemUserList(new MapBuilder<String, Object>().put("projectSn", projectSn).put("userId", user.getUserId()).build()); queryWrapper.apply(" ei.id = (select enterprise_id from xz_emergency_push where find_in_set({0},emergency_manager_id))", user.getUserId());
if (CollUtil.isEmpty(systemUserList)) {
enterpriseId = "-1";
} else {
XzEmergencyPush push = xzEmergencyPushMapper.selectOne(new LambdaQueryWrapper<XzEmergencyPush>()
.eq(XzEmergencyPush::getEnterpriseId, systemUserList.get(0).getEnterpriseId())
.eq(XzEmergencyPush::getProjectSn, projectSn)
);
if (push == null) {
enterpriseId = "-1";
} else {
List<String> userIds = StrUtil.split(push.getEmergencyManagerId(), ",");
if (userIds.contains(user.getUserId() + "")) {
enterpriseId = String.valueOf(push.getEnterpriseId());
} else {
enterpriseId = "-1";
}
}
}
} }
return enterpriseId;
} }
private List<XzEmergencyRecord> dealList(List<XzEmergencyRecord> list) { private List<XzEmergencyRecord> dealList(List<XzEmergencyRecord> list) {