From 536dbdec47d839914d34049957e886a282f8a36d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:43:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 922d147..822307a 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -256,14 +256,17 @@
* @return
*/
@GetMapping("/selectNum")
- public R selectNum(String serid,String jurisdiction) {
- return R.data(taskqdService.selectNum(serid, jurisdiction));
+ public R selectNum(String serid,String jurisdiction,String workjurisdiction) {
+ return R.data(taskqdService.selectNum(serid, jurisdiction,workjurisdiction));
}
@GetMapping("/startTask")
public R<Map> startTask(String rid, String serid,String type,String data) {
//获取组员id并进行通知
Map<String, Object> map = new HashMap<>();
+
+ serid = taskqdService.querySerid(rid);
+
int msg = pushMsgService.startTask(serid, rid,type,data);
map.put("res", msg);
map.put("type", type);
--
Gitblit v1.9.3