|
|
@@ -50,7 +50,7 @@ public class AccidentNoticeService { |
|
|
|
public JsonResult notice() { |
|
|
|
//当前登录用户 |
|
|
|
User user = CurrentUserUtil.getUserInfo(); |
|
|
|
String tenantId = user.getId(); |
|
|
|
String tenantId = user.getTenantId(); |
|
|
|
String userId = user.getId(); |
|
|
|
|
|
|
|
List<String> deptIdList = this.getDeptIdList(user); |
|
|
@@ -63,7 +63,7 @@ public class AccidentNoticeService { |
|
|
|
.eq(Accident::getFlag, FlagEnum.INSPECTION_ACCIDENT.getCode()) |
|
|
|
.eq(Accident::getMark, MarkEnum.VALID.getCode()) |
|
|
|
.orderByAsc(Accident::getCreateTime)); |
|
|
|
if(CollectionUtils.isEmpty(accidentList) || accidentList.size() == 0){ |
|
|
|
if(CollectionUtils.isEmpty(accidentList)){ |
|
|
|
return JsonResult.success("巡检任务无应急记录产生"); |
|
|
|
} |
|
|
|
//当前用户对应的应急记为未读才出现弹窗 |