From bd6318129968a4914ee0136b20f37b9efa796feb Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 26 Jan 2019 15:25:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=B0=E5=A2=9E=E5=AD=90?=
 =?UTF-8?q?=E7=BA=A7=E5=85=AC=E5=8F=B8=E7=9A=84=E6=97=B6=E5=80=99=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=9A=84=E5=8C=85=E5=90=AB=E6=9C=BA=E6=9E=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/support/CompanyServiceSupport.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
index ea3a2456..5d9f1e98 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
@@ -77,8 +77,12 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 		CompanyOffice where = new CompanyOffice();
 		where.setCompanyCode(company.getCompanyCode());
 		companyOfficeDao.deleteByEntity(where);
-		if (ListUtils.isNotEmpty(company.getCompanyOfficeList())){
-			companyOfficeDao.insertBatch(company.getCompanyOfficeList());
+		List<CompanyOffice> list = company.getCompanyOfficeList();
+		if (ListUtils.isNotEmpty(list)){
+			list.forEach(e -> {
+				e.setCompanyCode(company.getCompanyCode());
+			});
+			companyOfficeDao.insertBatch(list);
 		}
 		// 清理公司相关缓存
 		clearCompanyCache();