From f5d5b16a16c2f963b43996f1acac7824034db3c8 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 26 Nov 2021 11:41:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/modules/sys/entity/Company.java    |  9 ++++-----
 .../jeesite/modules/sys/web/CompanyController.java |  2 ++
 .../resources/views/modules/sys/companyForm.html   |  9 +++------
 .../main/resources/views/modules/sys/postList.html | 14 +++++++-------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
index eb83cad7..60490872 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
@@ -6,18 +6,17 @@ package com.jeesite.modules.sys.entity;
 
 import java.util.List;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 import org.apache.commons.lang3.StringUtils;
-import javax.validation.constraints.Size;
-import javax.validation.constraints.NotBlank;
 
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.entity.BaseEntity;
 import com.jeesite.common.entity.DataEntity;
 import com.jeesite.common.entity.Extend;
 import com.jeesite.common.entity.TreeEntity;
-import com.jeesite.common.mapper.JsonMapper;
 import com.jeesite.common.mybatis.annotation.Column;
 import com.jeesite.common.mybatis.annotation.JoinTable;
 import com.jeesite.common.mybatis.annotation.JoinTable.Type;
@@ -138,8 +137,8 @@ public class Company extends TreeEntity<Company> {
 		return companyOfficeList;
 	}
 	
-	public void setCompanyOfficeListJson(String jsonString) {
-		List<String> list = JsonMapper.fromJson(jsonString, List.class);
+	public void setOfficeCodes(String officeCodes) {
+		String[] list = StringUtils.split(officeCodes, ",");
 		if (list != null){
 			for (String val : list){
 				if (StringUtils.isNotBlank(val)){
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
index 4790abdd..92d6d123 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java
@@ -115,6 +115,8 @@ public class CompanyController extends BaseController {
 			office.setCompanyCode(company.getCompanyCode());
 			List<Office> officeList = officeService.findList(office);
 			model.addAttribute("officeList", officeList);
+			model.addAttribute("officeCodes", ListUtils.extractToString(officeList, "officeCode", ","));
+			model.addAttribute("officeNames", ListUtils.extractToString(officeList, "officeName", ","));
 		}
 		model.addAttribute("company", company);
 		model.addAttribute("ctrlPermi", Global.getConfig("user.adminCtrlPermi", "2"));
diff --git a/modules/core/src/main/resources/views/modules/sys/companyForm.html b/modules/core/src/main/resources/views/modules/sys/companyForm.html
index 76fdea32..67c5b913 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyForm.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyForm.html
@@ -85,12 +85,11 @@
 							<label class="control-label col-sm-4" title="">
 								<span class="required hide">*</span> ${text('包含机构')}：<i class="fa icon-question hide"></i></label>
 							<div class="col-sm-8">
-								<#form:treeselect id="companyOfficeList" title="${text('机构选择')}"
-									value="${@ListUtils.extractToString(officeList!, 'officeCode', ',')}"
-									labelValue="${@ListUtils.extractToString(officeList!, 'officeName', ',')}"
+								<#form:treeselect id="office" title="${text('机构选择')}"
+									name="officeCodes" value="${officeCodes!}"
+									labelName="officeNames" labelValue="${officeNames!}"
 									url="${ctx}/sys/office/treeData" checkbox="true"
 									class="" allowClear="true"/>
-								<#form:hidden name="companyOfficeListJson"/>
 							</div>
 						</div>
 					</div>
@@ -125,8 +124,6 @@
 <script>
 $("#inputForm").validate({
 	submitHandler: function(form){
-		var companyOfficeData = $('#companyOfficeListCode').val().split(',');
-		$("#companyOfficeListJson").val(JSON.stringify(companyOfficeData));
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html
index 0cea7b8c..02cb624a 100644
--- a/modules/core/src/main/resources/views/modules/sys/postList.html
+++ b/modules/core/src/main/resources/views/modules/sys/postList.html
@@ -16,18 +16,18 @@
 		<div class="box-body">
 			<#form:form id="searchForm" model="${post}" action="${ctx}/sys/post/listData" method="post" class="form-inline hide"
 					data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
-				<div class="form-group">
-					<label class="control-label">${text('岗位编码')}：</label>
-					<div class="control-inline">
-						<#form:input path="postCode" maxlength="64" class="form-control width-120"/>
-					</div>
-				</div>
 				<div class="form-group">
 					<label class="control-label">${text('岗位名称')}：</label>
 					<div class="control-inline">
 						<#form:input path="postName_like" maxlength="100" class="form-control width-120"/>
 					</div>
 				</div>
+				<div class="form-group">
+					<label class="control-label">${text('岗位代码')}：</label>
+					<div class="control-inline">
+						<#form:input path="viewCode" maxlength="64" class="form-control width-120"/>
+					</div>
+				</div>
 				<div class="form-group">
 					<label class="control-label">${text('岗位分类')}：</label>
 					<div class="control-inline width-90">
@@ -59,7 +59,7 @@ $('#dataGrid').dataGrid({
 		{header:'${text("岗位名称")}', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){
 			return '<a href="${ctx}/sys/post/form?postCode='+row.postCode+'" class="btnList" data-title="${text("编辑岗位")}">'+(val||row.id)+'</a>';
 		}},
-		{header:'${text("岗位编码")}', name:'postCode', index:'a.post_code', width:200, align:"center"},
+		{header:'${text("岗位代码")}', name:'viewCode', index:'a.view_code', width:200, align:"center"},
 		{header:'${text("排序号")}', name:'postSort', index:'a.post_sort', width:80, align:"center"},
 		{header:'${text("岗位分类")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){
 			return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true);