From 6dee99d69d5da74d465f60030f275f35ddb0bcfe Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Tue, 24 Jul 2018 15:49:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/impl/SysCompanyServiceImpl.java       | 2 +-
 .../main/resources/templates/modules/sys/company/detail.html  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
index aed8bd0..480492c 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysCompanyServiceImpl.java
@@ -22,7 +22,7 @@ public class SysCompanyServiceImpl extends ServiceImpl<SysCompanyMapper, SysComp
 	@Override
 	public List<SysCompanyEntity> treeData(String excludeId) {
 		
-		List<SysCompanyEntity> companyList = sysCompanyMapper.selectList(Condition.create().notLike("parent_ids", excludeId));
+		List<SysCompanyEntity> companyList = sysCompanyMapper.selectList(Condition.create().notLike("parent_ids", excludeId).ne("id", excludeId));
 		return companyList;
 	}
 
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/company/detail.html b/tamguo-oms/src/main/resources/templates/modules/sys/company/detail.html
index b7a5618..a4a67fc 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/company/detail.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/company/detail.html
@@ -78,7 +78,7 @@
 										class="required ">*</span> 公司编码：<i
 										class="fa icon-question hide"></i></label>
 										<div class="col-sm-8">
-											<input type="text" id="code" name="code" v-model="company.code" maxlength="64" class="form-control required abc" />
+											<input type="text" id="code" name="code" v-model="company.id" maxlength="64" class="form-control required abc" />
 										</div>
 								</div>
 							</div>
@@ -596,7 +596,7 @@ var vm = new Vue({
 				area : ['300px','400px' ],
 				content : ctx + 'sys/treeselect',
 				contentFormData : {
-					url : 'sys/company/treeData?excludeId=' + vm.company.parentId,
+					url : 'sys/company/treeData?excludeId=' + vm.company.id,
 					checkbox : 'false',
 					expandLevel : '-1',
 					selectCodes : $("#parentCode").val(),