From 138dead9b8a35d843a74a799e2cfbe1b12b51189 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期五, 20 六月 2025 17:46:38 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem
---
src/main/java/com/whyc/controller/WorkflowMainController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/controller/WorkflowMainController.java b/src/main/java/com/whyc/controller/WorkflowMainController.java
index 5b15efa..a7a1fe2 100644
--- a/src/main/java/com/whyc/controller/WorkflowMainController.java
+++ b/src/main/java/com/whyc/controller/WorkflowMainController.java
@@ -7,6 +7,7 @@
import com.whyc.service.WorkflowLinkService;
import com.whyc.service.WorkflowMainService;
import com.whyc.util.ActionUtil;
+import com.whyc.util.CommonUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +46,7 @@
@GetMapping("ownStatistics")
@ApiOperation(value = "鏈汉鐨勫崟鎹粺璁�",notes = "status鍚箟:1-瀹℃壒涓�,2-瀹℃壒瀹屾垚涓旈�氳繃,3-瀹℃壒瀹屾垚涓旈┏鍥�")
public Response<Map<Integer,Integer>> getOwnStatistics(int type){
- int userId = ActionUtil.getUser().getId().intValue();
+ int userId = CommonUtil.getUser().getId().intValue();
return service.getOwnStatistics(userId,type);
}
@@ -56,7 +57,7 @@
@GetMapping("ownListPage")
@ApiOperation(value = "鏈汉鐨勫崟鎹垪琛ㄥ垎椤�",notes = "status浼犲弬:0:鍏ㄩ儴,1-瀹℃壒涓�,2-瀹℃壒瀹屾垚涓旈�氳繃,3-瀹℃壒瀹屾垚涓旈┏鍥�")
public Response<PageInfo<WorkflowMain>> ownListPage(int type,int status,int pageNum,int pageSize){
- int userId = ActionUtil.getUser().getId().intValue();
+ int userId = CommonUtil.getUser().getId().intValue();
return service.ownListPage(userId,type,status,pageNum,pageSize);
}
@@ -67,7 +68,7 @@
@GetMapping("receivedStatistics")
@ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁缁熻",notes = "status鍚箟:1-寰呮帴鍗�,6-寰呭鏍�,58-宸插鏍�")
public Response<Map<Integer,Integer>> getReceivedStatistics(int type){
- User user = ActionUtil.getUser();
+ User user = CommonUtil.getUser();
return service.getReceivedStatistics(type,user);
}
@@ -78,7 +79,7 @@
@GetMapping("receivedListPage")
@ApiOperation(value = "鎺ユ敹鍒扮殑鍗曟嵁鍒楄〃鍒嗛〉", notes = "status浼犲弬:0-鍏ㄩ儴,1-寰呮帴鍗�,6-寰呭鏍�,5|8-宸插鏍�(閫氳繃|椹冲洖)")
public Response<PageInfo<WorkflowMain>> getReceivedListPage(int type, int status, int pageNum, int pageSize) {
- User user = ActionUtil.getUser();
+ User user = CommonUtil.getUser();
return service.getReceivedListPage(type, status, user, pageNum, pageSize);
}
--
Gitblit v1.9.1