From 61f0ed42abb8b3a270f3dcefeff988da5e73a5fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:55:05 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
index f11d042..fba889c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -10,7 +10,10 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.utils.ServletUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.Date;
@@ -38,8 +41,14 @@
* @return
*/
@Override
- public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name) {
- return reportMapper.selectAllReport(page, status, name);
+ public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name,boolean checked) {
+ Object obj = RedisUtil.get(ServletUtils.getRequest().getHeader("X-Token"));
+ Integer id=null;
+ if(checked&&!ObjectUtils.isEmpty(obj)){
+ Map loginUser = (Map) obj;
+ id=Integer.parseInt(String.valueOf(loginUser.get("id")));
+ }
+ return reportMapper.selectAllReport(page, status, name,id,checked);
}
//鎻愪氦
--
Gitblit v1.9.3