From 8b65a5c9e392f46eeea7cfda9647d59aee4ec81a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 二月 2025 11:40:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
index b3343fe..78d5dbc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -68,7 +68,7 @@
wrapper.lambda()
.eq(Sites::getCode,sites.getCode())
.eq(Sites::getIsdeleted,Constants.ZERO);
- Integer count = sitesMapper.selectCount(wrapper);
+ Long count = sitesMapper.selectCount(wrapper);
if (count > 0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
}
@@ -81,6 +81,7 @@
insert.setIsdeleted(Constants.ZERO);
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
+ insert.setType(sites.getType());
insert.setCode(sites.getCode());
insert.setElectronicFence(sites.getElectronicFence());
insert.setStatus(Constants.ZERO);
@@ -244,6 +245,9 @@
if (pageWrap.getModel().getClientVersion() != null) {
queryWrapper.lambda().eq(Sites::getClientVersion, pageWrap.getModel().getClientVersion());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Sites::getType, pageWrap.getModel().getType());
+ }
/*for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3