From a57229048537819328479bc84d3579b956962675 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 30 十一月 2021 14:26:14 +0800
Subject: [PATCH] 客户功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
index cd5ebba..534b2e7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientCollector.java
@@ -27,8 +27,8 @@
     }
 
 
-    @PostMapping("/update")
-    public ResponseVO<Object> updateClient(@RequestBody Long id,@RequestBody ClientPrarm clientPrarm){
+    @PostMapping("/update/{id}")
+    public ResponseVO<Object> updateClient(@PathVariable Long id,@RequestBody ClientPrarm clientPrarm){
         boolean b = clientService.updateClient(id,clientPrarm);
         if(b){
             return ResponseUtil.success("鏇存柊鎴愬姛");
@@ -37,8 +37,8 @@
         }
     }
 
-    @PostMapping("/delete")
-    public ResponseVO<Object> deleteClient(@RequestBody Long id){
+    @PostMapping("/delete/{id}")
+    public ResponseVO<Object> deleteClient(@PathVariable Long id){
         boolean b = clientService.deleteClient(id);
         if(b){
             return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -50,8 +50,12 @@
 
     @GetMapping("/list")
     public ResponseVO<Object> listClient(){
-        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();
+        Integer administratorIdentity = SecurityUtils.getAdministratorIdentity();//0 涓虹鐞嗗憳
         if(administratorIdentity==0){//鍒ゆ柇 濡傛灉鏄鐞嗗憳 灏卞垽鏂笅CustomerInspectContextHolder.getCustomerId() 鏈夋病鏈夊��
+            Long customerId = CustomerInspectContextHolder.getCustomerId();
+            if(customerId!=null){
+                return ResponseUtil.success(clientService.list());
+            }
             return ResponseUtil.success(clientService.list());
         }else {
             return ResponseUtil.success(clientService.clientList(SecurityUtils.getUserId()));

--
Gitblit v1.9.3