From efcf720d124617cb4a1ad4302bd5ecf3b870a470 Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Fri, 9 Mar 2018 10:27:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E7=B1=BB=E6=80=A7?=
 =?UTF-8?q?=E8=B4=A8=20=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=98=E5=8F=A0=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=EF=BC=88=E4=B8=8E=E9=9D=9E=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=B8=80=E8=87=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/basics/SysDictInfoController.java | 12 +++++++++++-
 .../WEB-INF/views/basics/sysDictInfoSearchList.jsp   | 11 ++++++-----
 src/main/webapp/WEB-INF/views/basics/sysDictList.jsp |  4 ++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index 46d5d712f..72991d6fb 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -153,18 +153,28 @@ public class SysDictInfoController extends BaseController {
 				//删除所有重复
 				for(int i=allList.size()-1;i>=0;i--){
 					SysDictInfo se = allList.get(i);
-					System.out.println("山前顺序"+se.getSysDictId());
+					//System.out.println("删前顺序"+se.getSysDictId());
 					if(se!=null&&se.getSysDictId()!=null){
 						if(tempList.contains(se.getSysDictId())){
 							allList.remove(se);
 						}
 					}
 				}
+				
+			/*	for(int i=allList.size()-1;i>=0;i--){
+					SysDictInfo se = allList.get(i);
+					System.out.println("删后顺序"+se.getSysDictId());
+				}*/
 		
 		
 		allList.addAll(page.getList());
 		SysDictInfo.sortList(list,allList,0,true);
 		
+		/*for(int i=list.size()-1;i>=0;i--){
+			SysDictInfo se = list.get(i);
+			System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
+		}*/
+		
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
index 9c14e8ae5..418db4c2c 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
@@ -62,8 +62,8 @@
 									<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 									<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 									<div class="col-md-12">
-										<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
 										<label class="search-lable">配置编码:</label><input id="itemCode" name="itemCode" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemCode}"/>
+										<label class="search-lable">配置内容:</label><input id="itemValue" name="itemValue" type="text" maxlength="25" class="input-medium" value="${sysDictInfo.itemValue}"/>
 					                     <label class="search-lable itemType">数据类型:</label> 
                                            <select id="itemType" name="itemType"  >
 							                   	<option value="" selected="selected">-请选择-</option>
@@ -88,14 +88,15 @@
 									 </div>
 								  </form:form>
 									<table id="treeTable" class="table table-striped table-bordered table-condensed">
-										<thead><tr><th>配置内容</th><th>配置编码</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
-										<tbody><c:forEach items="${page.list}" var="sysDictInfo">
+										<thead><tr><th>配置编码</th><th>配置内容</th><th>描述信息</th><th>数据类型</th><th>叶子节点</th><th>层级</th><th>创建人员</th><th>创建时间</th><th>最近修改人员</th><th>最近修改时间</th><shiro:hasPermission name="sys:menu:edit"><th>操作</th></shiro:hasPermission></tr></thead>
+										<tbody><c:forEach items="${list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
-												<td>${sysDictInfo.itemCode}</td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
+												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
 												<td>${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}</td>
+												<td>${sysDictInfo.levelNo}</td>
 												<td><c:if test="${sysDictInfo.sysDictCreator != null}">
 												    ${fns:getUserById(sysDictInfo.sysDictCreator.id).name}
 												    </c:if></td>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 33cfd9a18..9f3e3a6c5 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -91,8 +91,8 @@
 										<thead><tr><th><spring:message code="item_code"/></th><th><spring:message code="config_content"/></th><th><spring:message code="desc"/></th><th><spring:message code="item_type"/></th><th><spring:message code="is_leaf"/></th><th>层级</th><th><spring:message code="creator"/></th><th><spring:message code="create_time"/></th><th><spring:message code="editor"/></th><th><spring:message code="edit_time"/></th><shiro:hasPermission name="sys:menu:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 										<tbody><c:forEach items="${list}" var="sysDictInfo">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemValue}</a></td>
-												<td>${sysDictInfo.itemCode}</td>
+												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
+												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
 												<td>${fns:getDictLabel("SYS_DICT_ITM_TYPE",sysDictInfo.itemType,"0")}</td>
 												<td>${fns:getDictLabel("SYS_YES_NO",sysDictInfo.isLeaf,"0")}</td>