From a34d02ea17cfaeec1e576b9ac5100ed60b5f4b9e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 10 二月 2022 22:38:09 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 9 +++++----
1 files changed, 5 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 da5c10d..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) {
@@ -86,7 +87,7 @@
public Long getClientId(){
Long userId = SecurityUtils.getUserId();
Client one = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, userId));
- if(one.getSuperiorId()!=null){
+ if(one!=null&&one.getSuperiorId()!=null){
return one.getSuperiorId();
}else {
return userId;
--
Gitblit v1.9.3