From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
index 97b4c20..a6cea3a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java
@@ -2,8 +2,11 @@
import com.nanometer.smartlab.entity.HazardousWaste;
+import com.nanometer.smartlab.entity.dto.HazardousWasteUser;
+import com.nanometer.smartlab.entity.enumtype.Waster;
import com.nanometer.smartlab.service.HazardousWasteService;
import com.nanometer.smartlab.util.FacesUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.primefaces.model.LazyDataModel;
import org.primefaces.model.SortOrder;
@@ -46,11 +49,19 @@
List<HazardousWaste> list = null;
try {
- int pageCount = hazardousWasteService.countAll(startTime,endTime,status,applyPerson,project,department,tid);
-
- this.setRowCount(pageCount);
- if (pageCount > 0)
- list = hazardousWasteService.selectAll(startTime,endTime,status,applyPerson,project,department,tid,first, pageSize);
+ if (getUser().getWaster() != null){
+ if (getUser().getWaster().equals(Waster.MANAGE)){
+ int pageCount = hazardousWasteService.countAll(startTime,endTime,status,applyPerson,project,department,tid);
+ this.setRowCount(pageCount);
+ if (pageCount > 0)
+ list = hazardousWasteService.selectAll(startTime,endTime,status,applyPerson,project,department,tid,first, pageSize);
+ }else if (StringUtils.isNotBlank(getUser().getProject())){
+ int pageCount = hazardousWasteService.countAll(startTime,endTime,status,applyPerson,getUser().getProject(),department,tid);
+ this.setRowCount(pageCount);
+ if (pageCount > 0)
+ list = hazardousWasteService.selectAll(startTime,endTime,status,applyPerson,getUser().getProject(),department,tid,first, pageSize);
+ }
+ }
//查询更换模式
if (isSearch) {
isSearch = false;
@@ -203,7 +214,15 @@
public void export2Excel() {
- List<Map> list = hazardousWasteService.exportList(startTime,endTime,status,applyPerson,project,department,tid);
+ List<Map> list = new ArrayList<>();
+ if (getUser().getWaster() != null){
+ if (getUser().getWaster().equals(Waster.MANAGE)){
+ list = hazardousWasteService.exportList(startTime,endTime,status,applyPerson,project,department,tid);
+ }else if (StringUtils.isNotBlank(getUser().getProject())){
+ list = hazardousWasteService.exportList(startTime,endTime,status,applyPerson,getUser().getProject(),department,tid);
+ }
+ }
+
try{
hazardousWasteService.export2Excel(list);
}catch (Exception e){
--
Gitblit v1.9.2