From 775a4818b1ff4f18f17b24108cc92c23f728ea61 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 19 四月 2024 15:03:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 910bff4..4006406 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -6,6 +6,7 @@
import com.core.common.R;
import com.zy.crm.common.web.BaseController;
import com.zy.crm.manager.entity.*;
+import com.zy.crm.manager.entity.param.UserNowParam;
import com.zy.crm.manager.service.*;
import com.zy.crm.system.entity.Role;
import com.zy.crm.system.entity.User;
@@ -133,7 +134,7 @@
map.put("successCount", successCount);
//鑾峰彇寰呭鐞嗕换鍔℃暟閲�
- int planPendingTaskCount = planService.selectCount(new EntityWrapper<Plan>().eq("director", getUserId()).lt("settle",4));
+ int planPendingTaskCount = planService.selectPendingTaskCount(getUserId());
map.put("planPendingTaskCount", planPendingTaskCount);
int priOnlinePendingTaskCount = priOnline2Service.selectCount(new EntityWrapper<PriOnline2>().eq("member_id", getUserId()).lt("settle",2));
map.put("priOnlinePendingTaskCount", priOnlinePendingTaskCount);
@@ -259,4 +260,23 @@
return R.ok(item);
}
+ @RequestMapping("/dashboard/user/id/popup/auth2")
+ public R popupUserId2(String token) {
+ UserNowParam userNowParam = new UserNowParam();
+ if (Cools.isEmpty(token)){
+ return R.ok(userNowParam);
+ }
+ try{
+ User user = getUser(token);
+ if (Cools.isEmpty(user) || Cools.isEmpty(user.getId())){
+ return R.ok(userNowParam);
+ }
+ userNowParam.setUserName(user.getNickname());
+ userNowParam.setUserId(user.getId());
+ userNowParam.setDeptId(user.getDeptId());
+ return R.ok().add(userNowParam);
+ }catch (Exception ignored){ }
+ return R.ok(userNowParam);
+ }
+
}
--
Gitblit v1.9.1