From 02a6a1df18a5582878ecbc30e46350c73d8cbc5a Mon Sep 17 00:00:00 2001
From: st <280306299@qq.com>
Date: Sat, 2 Mar 2024 16:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=AE=A2=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ics/admin/controller/CustomerStaffController.java  |  7 +++++--
 .../com/ics/common/core/controller/BaseController.java | 10 ++++++++++
 .../java/com/ics/system/domain/vo/CurrentUserVO.java   |  5 +++++
 .../com/ics/system/log/publish/PublishFactory.java     |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java
index 9aced77..c9cdd26 100644
--- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java
+++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java
@@ -1,5 +1,6 @@
 package com.ics.admin.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ics.admin.domain.IcsCustomerStaff;
 import com.ics.admin.service.IIcsCustomerStaffService;
 import com.ics.common.constant.Constants;
@@ -41,7 +42,8 @@ public class CustomerStaffController extends BaseController {
     @GetMapping("list")
     public R list(IcsCustomerStaff icsCustomerStaff) {
         startPage();
-        icsCustomerStaff.setIcsCustomerId(1L);//临时设置,需要从用户信息中获取
+        Integer staffId = getLoginStaffId();
+        icsCustomerStaff.setIcsCustomerId(staffId.longValue());
         icsCustomerStaff.setDataType(Constants.CUSTOMER_STAFF);
         return result(icsCustomerStaffService.selectIcsCustomerStaffList(icsCustomerStaff));
     }
@@ -53,7 +55,8 @@ public class CustomerStaffController extends BaseController {
     @RequiresPermissions("admin:staff:add")
     @PostMapping("save")
     public R addSave(@RequestBody IcsCustomerStaff icsCustomerStaff) {
-        icsCustomerStaff.setIcsCustomerId(1L);
+        Integer staffId = getLoginStaffId();
+        icsCustomerStaff.setIcsCustomerId(staffId.longValue());
         icsCustomerStaff.setCreateTime(new Date());
         icsCustomerStaff.setCreateBy(getLoginName());
         icsCustomerStaff.setDataType(Constants.CUSTOMER_STAFF);
diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/core/controller/BaseController.java b/ics-common/ics-common-core/src/main/java/com/ics/common/core/controller/BaseController.java
index 8b1c92c..1a9639d 100644
--- a/ics-common/ics-common-core/src/main/java/com/ics/common/core/controller/BaseController.java
+++ b/ics-common/ics-common-core/src/main/java/com/ics/common/core/controller/BaseController.java
@@ -113,6 +113,16 @@ public class BaseController {
         return null;
     }
 
+    public Integer getLoginStaffId() {
+        Token token = SubjectUtil.getToken(getRequest());
+        String value = valueOperations.get(ACCESS_USERID + ":" + token.getUserId());
+        JSONObject jo = StringUtils.isEmpty(value) ? null : JSON.parseObject(value, JSONObject.class);
+        if (jo != null && jo.containsKey("staffId")) {
+            return (Integer)jo.get("staffId");
+        }
+        return null;
+    }
+
 
     /**
      * 响应返回结果
diff --git a/ics-system/src/main/java/com/ics/system/domain/vo/CurrentUserVO.java b/ics-system/src/main/java/com/ics/system/domain/vo/CurrentUserVO.java
index 3b12440..8757e60 100644
--- a/ics-system/src/main/java/com/ics/system/domain/vo/CurrentUserVO.java
+++ b/ics-system/src/main/java/com/ics/system/domain/vo/CurrentUserVO.java
@@ -76,4 +76,9 @@ public class CurrentUserVO {
      */
     private Boolean isAdmin;
 
+    /**
+     * 客户id
+     */
+    private Long staffId;
+
 }
diff --git a/ics-system/src/main/java/com/ics/system/log/publish/PublishFactory.java b/ics-system/src/main/java/com/ics/system/log/publish/PublishFactory.java
index d20bb79..0d327d5 100644
--- a/ics-system/src/main/java/com/ics/system/log/publish/PublishFactory.java
+++ b/ics-system/src/main/java/com/ics/system/log/publish/PublishFactory.java
@@ -89,6 +89,7 @@ public class PublishFactory {
             userOnline.setDeptId(user.getDept().getId());
             userOnline.setDeptName(user.getDept().getDeptName());
         }
+        userOnline.setStaffId(user.getStaffId());
         // 发布事件
         SpringContextHolder.publishEvent(new UserOnlineEvent(userOnline));
     }