Merge remote-tracking branch 'origin/dev' into dev

server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

@@ -15,7 +15,6 @@ import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,8 +38,8 @@ public class PlatAlarmRecordChildrenController {
         //只能看到发给关联的长者告警
         //只能看到发给关联的长者告警
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);
         Map<String, Object> resMap = Maps.newHashMap();
         Map<String, Object> resMap = Maps.newHashMap();
-        boolean b = result.getList().stream().anyMatch(p -> StringUtils.equals(CommonEnum.NO.getValue(), p.getWechatReadFlag()));
-        resMap.put("todoFlag", b);
+        boolean b = result.getList().stream().anyMatch(p -> !CommonEnum.YES.getValue().equals(p.getWechatReadFlag()));
+        resMap.put("wechatReadFlag", b);
         resMap.put("page", result);
         resMap.put("page", result);
         return ApiResponseUtils.success(resMap);
         return ApiResponseUtils.success(resMap);
     }
     }