From d5af4c53291b0ff2922139434e91597276e4e6fb Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 06 一月 2022 16:31:35 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 8fbbdc6..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,6 +2,7 @@
 
 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;
@@ -20,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());
@@ -70,8 +71,8 @@
         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) {

--
Gitblit v1.9.3