From 5d8af1cab89e9377acd2ca63c7b9b04c4394c43e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Sat, 25 Oct 2025 21:57:13 +0800
Subject: [PATCH] =?UTF-8?q?10-25-=E4=BE=9B=E5=BA=94=E5=95=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java  | 2 +-
 .../main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java | 2 +-
 .../main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java | 2 +-
 .../dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java   | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
index f2ce057e..17d9fa20 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
@@ -34,7 +34,7 @@ public class XzdSupplierInfo extends BaseEntity {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
index 584e0383..3c5d40bf 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
@@ -34,7 +34,7 @@ public class XzdSupplierInfoBo extends BaseEntity {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
index 9d05ff92..9d31e5e4 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
@@ -39,7 +39,7 @@ public class XzdSupplierInfoVo implements Serializable {
     /**
      * 区域编码
      */
-    private String cityCode;
+    private Long cityCode;
 
     /**
      * 单位编号
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
index 20690004..0ecbc11f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdSupplierInfoServiceImpl.java
@@ -561,7 +561,6 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        boolean b = baseMapper.deleteByIds(ids) > 0;
 
         for (Long id : ids) {
 
@@ -694,7 +693,7 @@ public class XzdSupplierInfoServiceImpl extends ServiceImpl<XzdSupplierInfoMappe
             xzdContractInfoService.remove(contractInfoLambdaQueryWrapper);
         }
 
-        return b;
+        return baseMapper.deleteByIds(ids) > 0;
     }