From 29febf388aa86d87198fe82e4af7eb88567d0d65 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期二, 18 一月 2022 16:59:23 +0800
Subject: [PATCH] 权限管理

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 934a95a..168382d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.service.impl.BaseServiceImpl;
 import com.sandu.ximon.admin.param.ClientPrarm;
+import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.mapper.ClientMapper;
 import lombok.AllArgsConstructor;
@@ -19,7 +21,7 @@
 
     public boolean addClient(ClientPrarm clientPrarm) {
         Client client = new Client();
-        if (clientPrarm.getClientSuperior() != null) {
+        if (clientPrarm.getClientSuperior() != null&&!"".equals(clientPrarm.getClientSuperior())) {
             Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, clientPrarm.getClientSuperior()));
             if (one != null) {
                 client.setSuperiorId(one.getId());
@@ -38,7 +40,6 @@
 
 
     public boolean updateClient(Long id, ClientPrarm clientPrarm) {
-        //Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, id));
         Client one = getById(id);
         if (one == null) {
             throw new BusinessException("璇ュ鎴蜂笉瀛樺湪");
@@ -70,11 +71,27 @@
         return removeById(id);
     }
 
-    public List<Client>  clientList(Long userId) {
-        return clientMapper.clientList(userId);
+    public List<Client>  clientList(Long userId, BaseConditionVO baseConditionVO) {
+        return clientMapper.clientList(userId,baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
     }
 
     public Client findByPhone(String phone) {
         return getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getMobile, phone).last("limit 1"));
     }
+
+    /**\
+     * 鍏朵粬绫荤敤鏉ユ煡鎵惧鎴穒d浣跨敤  濡傛灉娌℃湁涓婄骇瀹㈡埛 杩欒繑鍥炵敤鎴稩D
+     * @param
+     * @return
+     */
+    public Long getClientId(){
+        Long userId = SecurityUtils.getUserId();
+        Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
+        if(one!=null&&one.getSuperiorId()!=null){
+            return one.getSuperiorId();
+        }else {
+            return userId;
+        }
+
+    }
 }

--
Gitblit v1.9.3