From 431067312ac266c2189b13ca71e5230d2bfa7da4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 15:09:25 +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 | 5 ++++-
1 files changed, 4 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 6aed1e4..b3343fe 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
@@ -66,7 +66,8 @@
QueryWrapper<Sites> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(Sites::getCode,sites.getCode());
+ .eq(Sites::getCode,sites.getCode())
+ .eq(Sites::getIsdeleted,Constants.ZERO);
Integer count = sitesMapper.selectCount(wrapper);
if (count > 0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"绔欑偣缂栧彿宸插瓨鍦�");
@@ -81,6 +82,7 @@
insert.setInfo(sites.getInfo());
insert.setName(sites.getName());
insert.setCode(sites.getCode());
+ insert.setElectronicFence(sites.getElectronicFence());
insert.setStatus(Constants.ZERO);
insert.setLockNum(sites.getLockNum());
insert.setIp(sites.getIp());
@@ -123,6 +125,7 @@
update.setEditor(principal.getId());
update.setName(sites.getName());
update.setLockNum(sites.getLockNum());
+ update.setElectronicFence(sites.getElectronicFence());
update.setIp(sites.getIp());
update.setNeedNotice(sites.getNeedNotice());
sitesMapper.updateById(update);
--
Gitblit v1.9.3