优化

tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysCompanyEntity.java

@@ -17,12 +17,12 @@ import com.tamguo.modules.sys.model.enums.SysCompanyStatusEnum;
 public class SysCompanyEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	private String code;
+	private String id;
 	private String name;
 	private String fullName;
 	private String type;
 	private String remarks;
-	private String parentCode;
+	private String parentId;
 	private Boolean isLeaf;
 	private Integer treeLevel;
 	private Date updateDate;
@@ -78,12 +78,6 @@ public class SysCompanyEntity implements Serializable {
 	public void setUpdateDate(Date updateDate) {
 		this.updateDate = updateDate;
 	}
-	public String getCode() {
-		return code;
-	}
-	public void setCode(String code) {
-		this.code = code;
-	}
 	public SysCompanyStatusEnum getStatus() {
 		return status;
 	}
@@ -96,11 +90,17 @@ public class SysCompanyEntity implements Serializable {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
-	public String getParentCode() {
+	public String getId() {
-		return parentCode;
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getParentId() {
+		return parentId;
 	}
-	public void setParentCode(String parentCode) {
+	public void setParentId(String parentId) {
-		this.parentCode = parentCode;
+		this.parentId = parentId;
 	}
 
 }

tamguo-oms/src/main/resources/mappers/SysCompanyMapper.xml

@@ -4,8 +4,8 @@
 	
 	<select id="listData" resultType="SysCompanyEntity">
 		SELECT
-			c.code,
+			c.id,
-			c.parent_code,
+			c.parent_id,
 			c.is_leaf,
 			c.tree_level,
 			c.name,
@@ -20,7 +20,7 @@
 			1 = 1
 			<choose>
 		        <when test="parentCode != null and parentCode != ''">
-		          	and c.parent_code = #{parentCode}
+		          	and c.parent_id = #{parentCode}
 		        </when>
 		        <otherwise>
 		            and c.tree_level = 0
@@ -31,8 +31,8 @@
 	
 	<select id="selectByCode" resultType="SysCompanyEntity">
 		SELECT
-			c.code,
+			c.id,
-			c.parent_code,
+			c.parent_id,
 			c.is_leaf,
 			c.tree_level,
 			c.name,
@@ -44,8 +44,8 @@
 			cp.name as parent_name
 		FROM
 			sys_company c
-		LEFT JOIN sys_company cp on cp.code = c.parent_code
+		LEFT JOIN sys_company cp on cp.id = c.parent_id
 		WHERE
-			c.code = #{code}
+			c.id = #{id}
 	</select>
 </mapper>

tamguo-oms/src/main/resources/static/jqGrid/4.7/js/jquery.jqGrid.extend.js

@@ -22,7 +22,7 @@
             },
             treeReader: {
                 level_field: "treeLevel",
-                parent_id_field: "parentCode",
+                parent_id_field: "parentId",
                 userdata: "otherData",
                 leaf_field: "isLeaf",
                 expanded_field: "isOpen",

tamguo-oms/src/main/resources/templates/modules/sys/company/index.html

@@ -86,10 +86,9 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 $('#dataGrid').dataGrid({
 	searchForm: $("#searchForm"),
 	columnModel: [
-		{header:'公司名称', name:'name', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
+		{header:'公司名称', name:'name', index:'a.name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.code+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.code+'" class="btnList" data-title="编辑公司">'+(val||row.code)+'</a>';
+			return '( '+row.id+' ) '+'<a href="/js/a/sys/company/form?companyCode='+row.id+'" class="btnList" data-title="编辑公司">'+(val||row.id)+'</a>';
 		}},
-		{header:'公司编码', name:'code', index:'a.code',hidden : true, align:"left"},
 		{header:'公司全称', name:'fullName', index:'a.full_name', width:200, align:"left"},
 		{header:'排序号', name:'treeSort', index:'a.tree_sort', width:80, align:"center"},
 		{header:'归属区域', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"},
@@ -100,7 +99,7 @@ $('#dataGrid').dataGrid({
 		}},
 		{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
 			var actions = [];
-				actions.push('<a href="'+ctx+'sys/company/detail?id='+row.code+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
+				actions.push('<a href="'+ctx+'sys/company/detail?id='+row.id+'" class="btnList" title="编辑公司"><i class="fa fa-pencil"></i></a>&nbsp;');
 				if (row.status == Global.STATUS_NORMAL){
 					actions.push('<a href="/js/a/sys/office/disable?officeCode='+row.officeCode+'" class="btnList" title="停用机构" data-confirm="确认要停用该机构吗？"><i class="glyphicon glyphicon-ban-circle"></i></a>&nbsp;');
 				}