From 9722a4ccf0e631c0b238fd315c19e04aba0c5314 Mon Sep 17 00:00:00 2001
From: xxaaxx5566 <2719109211@qq.com>
Date: Mon, 20 Jul 2026 21:06:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(address):=20=E5=BC=BA=E5=8C=96=E8=A1=8C?=
 =?UTF-8?q?=E6=94=BF=E5=8C=BA=E5=88=92=E5=8F=8A=E5=9D=90=E6=A0=87=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将region_name、longitude、latitude字段设为非空
- 在SQL映射中添加region_code字段支持
- 修改实体类及服务逻辑，新增region_code字段赋值
- 增加对region_name、longitude、latitude字段的非空校验
- 新增region_code长度校验，完善字段长度限制
- 更新数据库表定义，调整相关字段约束
---
 .../service/impl/CommonAddressServiceImpl.java       | 12 +++++++++++-
 doc/sql/transport/blade_common_address.sql           |  3 +--
 doc/sql/transport/transport.sql                      |  3 +--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
index da37722..ea2c22b 100644
--- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
+++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
@@ -91,6 +91,7 @@ public class CommonAddressServiceImpl extends BaseServiceImpl<CommonAddressMappe
 		if (Func.isEmpty(address) || Objects.equals(address.getIsDeleted(), 1)) {
 			throw new ServiceException("常用地址不存在");
 		}
+		validateReadableDept(address);
 		CommonAddressVO addressVO = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressVO.class));
 		fillDisplay(addressVO);
 		return addressVO;
@@ -100,7 +101,10 @@ public class CommonAddressServiceImpl extends BaseServiceImpl<CommonAddressMappe
 	@Transactional(rollbackFor = Exception.class)
 	public boolean submit(CommonAddress address) {
 		boolean created = Func.isEmpty(address.getId());
-		if (!created) {
+		if (created) {
+			fillCurrentDept(address);
+			address.setAddressCode(null);
+		} else {
 			CommonAddress oldAddress = getEditableAddress(address.getId());
 			address.setAddressCode(oldAddress.getAddressCode());
 			address.setDeptId(oldAddress.getDeptId());
@@ -302,6 +306,12 @@ public class CommonAddressServiceImpl extends BaseServiceImpl<CommonAddressMappe
 		}
 	}
 
+	private void validateReadableDept(CommonAddress address) {
+		if (!AuthUtil.isAdministrator() && !Objects.equals(address.getDeptId(), currentDeptId())) {
+			throw new ServiceException("无权查看其他组织常用地址");
+		}
+	}
+
 	private void fillDisplay(CommonAddressVO address) {
 		address.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode());
 		address.setReadonly(!Objects.equals(address.getDeptId(), currentDeptId()));
diff --git a/doc/sql/transport/blade_common_address.sql b/doc/sql/transport/blade_common_address.sql
index c9b3ed9..7d7cc04 100644
--- a/doc/sql/transport/blade_common_address.sql
+++ b/doc/sql/transport/blade_common_address.sql
@@ -39,8 +39,7 @@ CREATE TABLE `blade_common_address` (
 -- Menu data for common address
 -- ----------------------------
 INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
-(2080000000000000001, 0, 'base_data', '基础数据', 'base_data', '/base', 'iconfont icon-caidan', 30, 1, 0, 1, NULL, '', 0),
-(2080000000000000010, 2080000000000000001, 'common_address', '常用地址', 'common_address', '/base/common-address', 'iconfont icon-dizhi', 10, 1, 0, 1, NULL, '', 0),
+(2080000000000000010, 1164733399668962201, 'common_address', '常用地址', 'common_address', '/base/common-address', 'iconfont icon-dizhi', 10, 1, 0, 1, NULL, '', 0),
 (2080000000000000011, 2080000000000000010, 'common_address_view', '查看', 'common_address_view', '', '', 1, 2, 0, 1, NULL, '', 0),
 (2080000000000000012, 2080000000000000010, 'common_address_add', '新增', 'common_address_add', '', '', 2, 2, 0, 1, NULL, '', 0),
 (2080000000000000013, 2080000000000000010, 'common_address_edit', '编辑', 'common_address_edit', '', '', 3, 2, 0, 1, NULL, '', 0),
diff --git a/doc/sql/transport/transport.sql b/doc/sql/transport/transport.sql
index e1667dc..3a6399c 100644
--- a/doc/sql/transport/transport.sql
+++ b/doc/sql/transport/transport.sql
@@ -6035,8 +6035,7 @@ COMMIT;
 -- Menu data for blade_common_address
 -- ----------------------------
 INSERT IGNORE INTO `blade_menu` (`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `component`, `remark`, `is_deleted`) VALUES
-(2080000000000000001, 0, 'base_data', '基础数据', 'base_data', '/base', 'iconfont icon-caidan', 30, 1, 0, 1, NULL, '', 0),
-(2080000000000000010, 2080000000000000001, 'common_address', '常用地址', 'common_address', '/base/common-address', 'iconfont icon-dizhi', 10, 1, 0, 1, NULL, '', 0),
+(2080000000000000010, 1164733399668962201, 'common_address', '常用地址', 'common_address', '/base/common-address', 'iconfont icon-dizhi', 10, 1, 0, 1, NULL, '', 0),
 (2080000000000000011, 2080000000000000010, 'common_address_view', '查看', 'common_address_view', '', '', 1, 2, 0, 1, NULL, '', 0),
 (2080000000000000012, 2080000000000000010, 'common_address_add', '新增', 'common_address_add', '', '', 2, 2, 0, 1, NULL, '', 0),
 (2080000000000000013, 2080000000000000010, 'common_address_edit', '编辑', 'common_address_edit', '', '', 3, 2, 0, 1, NULL, '', 0),