From 07ca844b3441a2774a1ca02a952e27e3fe986819 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 17:50:44 +0800
Subject: [PATCH] jtt808初始化

---
 server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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..30b29df 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,8 +66,9 @@
 
         QueryWrapper<Sites> wrapper = new QueryWrapper<>();
         wrapper.lambda()
-                .eq(Sites::getCode,sites.getCode());
-        Integer count = sitesMapper.selectCount(wrapper);
+                .eq(Sites::getCode,sites.getCode())
+                .eq(Sites::getIsdeleted,Constants.ZERO);
+        Long 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);
@@ -241,6 +244,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