From cc41e4294e639fdb399bfc9080ec2fcce6aeae3d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 20 一月 2026 14:57:29 +0800
Subject: [PATCH] update
---
admin-server/src/main/java/com/estate/expert/admin/service/impl/ScreenAccountServiceImpl.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ScreenAccountServiceImpl.java b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ScreenAccountServiceImpl.java
index f15de41..51c7a8c 100644
--- a/admin-server/src/main/java/com/estate/expert/admin/service/impl/ScreenAccountServiceImpl.java
+++ b/admin-server/src/main/java/com/estate/expert/admin/service/impl/ScreenAccountServiceImpl.java
@@ -6,24 +6,15 @@
import com.estate.expert.admin.domain.business.client.ClientRepository;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccount;
import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountDto;
-import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountMapper;
-import com.estate.expert.admin.domain.business.screenaccount.ScreenAccountRepository;
-import com.estate.expert.admin.domain.common.EntityBase;
import com.estate.expert.admin.domain.common.request.PageReq;
import com.estate.expert.admin.domain.project.ProjectRepository;
import com.estate.expert.admin.domain.repository.ScreenAccountMybatisMapper;
-import com.estate.expert.admin.domain.user.User;
-import com.estate.expert.admin.enums.BizResultCode;
import com.estate.expert.admin.service.ScreenAccountService;
-import com.estate.expert.admin.utils.MD5Utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.Arrays;
import java.util.List;
-import java.util.stream.Collectors;
/**
* 大屏账号服务实现
@@ -32,8 +23,6 @@
@Service
public class ScreenAccountServiceImpl extends ServiceImpl<ScreenAccountMybatisMapper, ScreenAccount> implements ScreenAccountService {
- @Resource
- private ScreenAccountRepository screenAccountRepository;
@Resource
private ClientRepository clientRepository;
@@ -63,6 +52,7 @@
}
Page<ScreenAccountDto> page = new Page<>(pageReq.getPage(), pageReq.getSize());
List<ScreenAccountDto> list = screenAccountMybatisMapper.list(page, name,keyword, type,clientListIds, projectIds);
+// Page<ScreenAccountDto> list = screenAccountMybatisMapper.listPage(page, name,keyword, type,clientListIds, projectIds);
if(!list.isEmpty()){
for (ScreenAccountDto screenAccountDto : list) {
if(screenAccountDto.getType()==1){
@@ -84,13 +74,13 @@
@Override
public boolean existsByAccount(String account) {
- List<ScreenAccount> screenAccounts = screenAccountMybatisMapper.selectList(new LambdaUpdateWrapper<ScreenAccount>().eq(ScreenAccount::getAccount, account).eq(EntityBase::isDeleted, false));
+ List<ScreenAccount> screenAccounts = screenAccountMybatisMapper.selectList(new LambdaUpdateWrapper<ScreenAccount>().eq(ScreenAccount::getAccount, account).eq(ScreenAccount::getDeleted, false));
return !screenAccounts.isEmpty();
}
@Override
public boolean existsByAccountAndIdNot(String account, Integer id) {
- List<ScreenAccount> screenAccounts = screenAccountMybatisMapper.selectList(new LambdaUpdateWrapper<ScreenAccount>().eq(ScreenAccount::getAccount, account).ne(EntityBase::getId,id).eq(EntityBase::isDeleted, false));
+ List<ScreenAccount> screenAccounts = screenAccountMybatisMapper.selectList(new LambdaUpdateWrapper<ScreenAccount>().eq(ScreenAccount::getAccount, account).ne(ScreenAccount::getId,id).eq(ScreenAccount::getDeleted, false));
return !screenAccounts.isEmpty();
}
--
Gitblit v1.7.1