diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java index 3d2fc7db..da169420 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/controller/OcrMsgReadController.java @@ -112,12 +112,13 @@ public class OcrMsgReadController { QueryWrapper wrapperlist = new QueryWrapper<>(); wrapperlist.select("id").eq("msg_category",msgCategory).eq("send_status","1").apply(" FIND_IN_SET('"+userToken.getUserid()+"',receive_user_ids)"); - QueryWrapper wrapperone = new QueryWrapper<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS"); List list = iocrmsgservice.list(wrapperlist); for (OcrMsg msg:list){ + QueryWrapper wrapperone = new QueryWrapper<>(); wrapperone.eq("msg_id", msg.getId()).eq("user_id",userToken.getUserid()); OcrMsgRead one = ocrMsgReadService.getOne(wrapperone); if(null==one) { @@ -144,18 +145,24 @@ public class OcrMsgReadController { SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSSS"); + QueryWrapper wrapperone = new QueryWrapper<>(); + wrapperone.eq("msg_id", msgid).eq("user_id",userToken.getUserid()); + OcrMsgRead one = ocrMsgReadService.getOne(wrapperone); + if(null==one) { + OcrMsgRead ocrmsgread=new OcrMsgRead(); + ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); + ocrmsgread.setMsgId(Long.valueOf(msgid)); + ocrmsgread.setUserId(Long.valueOf(userToken.getUserid())); + ocrmsgread.setReadFlag(1); + ocrmsgread.setReadTime(System.currentTimeMillis()); + + ocrMsgReadService.save(ocrmsgread); + return ResultVoUtil.success(ResultVo.SUCCESS); + } - OcrMsgRead ocrmsgread=new OcrMsgRead(); - ocrmsgread.setId(Long.valueOf(sdf.format(System.currentTimeMillis()))); - ocrmsgread.setMsgId(Long.valueOf(msgid)); - ocrmsgread.setUserId(Long.valueOf(userToken.getUserid())); - ocrmsgread.setReadFlag(1); - ocrmsgread.setReadTime(System.currentTimeMillis()); - boolean save = ocrMsgReadService.save(ocrmsgread); - //此处需要手工处理 返回需要将修改后的数据返回 -// return new ResponseEntity(save,HttpStatus.OK); - return ResultVoUtil.success(save); + + return ResultVoUtil.success(ResultVo.SUCCESS); } }