From 42f388d874cc9e8c4f0e823055c5e0fc22511c2c Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Wed, 4 Apr 2018 18:16:21 +0800
Subject: [PATCH] =?UTF-8?q?sys=5Fdict=5Finfo=20=E6=96=B0=E5=A2=9Eis=5Finit?=
 =?UTF-8?q?ianlize=E5=AD=97=E6=AE=B5=EF=BC=88=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BE=97=E5=88=A0=E9=99=A4=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BB=85admin=E5=8F=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/basics/SysDictInfo.java    |  7 ++++++
 .../com/nis/web/dao/basics/SysDictInfoDao.xml |  3 ++-
 .../service/basics/SysDictInfoService.java    |  1 +
 .../WEB-INF/views/basics/sysDictList.jsp      | 24 ++++++++++++++++---
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/domain/basics/SysDictInfo.java b/src/main/java/com/nis/domain/basics/SysDictInfo.java
index 29a2fbd1b..0edc75a5e 100644
--- a/src/main/java/com/nis/domain/basics/SysDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/SysDictInfo.java
@@ -30,6 +30,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	private SysUser sysDictEditor; //editor_id	修改人员	int	Y	取自sys_user.id
 	private Date editTime; //edit_time	修改时间	date	Y	
 	private Integer levelNo; //层级
+	private Integer isInitianlize; //是否为初始化数据 0：否  1：是  
 	private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
 	
     private Date beginDate;		// 开始日期
@@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	public void setConditionType(List<Integer> conditionType) {
 		this.conditionType = conditionType;
 	}
+	public Integer getIsInitianlize() {
+		return isInitianlize;
+	}
+	public void setIsInitianlize(Integer isInitianlize) {
+		this.isInitianlize = isInitianlize;
+	}
 	@JsonIgnore
 	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
diff --git a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
index f8f39b3a4..e9163d5f1 100644
--- a/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/SysDictInfoDao.xml
@@ -43,7 +43,8 @@
 		s.creator_id AS "sysDictCreator.id",
 		s.create_time AS createTime,
 		s.editor_id AS "sysDictEditor.id",
-		s.edit_time AS editTime
+		s.edit_time AS editTime,
+		s.is_initianlize AS isInitianlize
 	</sql>
 	
 	   	<sql id="menuJoins">
diff --git a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
index 6eb3ac530..d2113e174 100644
--- a/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/SysDictInfoService.java
@@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{
     	  sysDictInfo.setCreateTime(new Date());
     	  sysDictInfo.setSysDictEditor(user);
     	  sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
+    	  sysDictInfo.setIsInitianlize(0);//是否为初始化数据，默认为0：否
     	  sysDictInfoDao.insertDict(sysDictInfo);
     	  
 		}
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 9854519b8..4971c0fd4 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -31,13 +31,21 @@
 		function cmd(){
 			var url=arguments[0];
 			var mulitId="";
+			var isinit = true;
 			jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){
 			  if(jQuery(this).val()!=""){
+				  if(jQuery(this).prop("placeholder")==1){
+					  isinit = false;
+				  }
 			    mulitId+=jQuery(this).val()+",";
 			  }
 			});
 			if(mulitId!=""){
-				confirmx("<spring:message code='confirm_message'/>", url+"&mulitId="+mulitId);
+				if(isinit){
+					confirmx("<spring:message code='confirm_message'/>", url+"&mulitId="+mulitId);
+				}else{
+					top.$.jBox.tip("<spring:message code='has_initianlize'/>", "<spring:message code='info'/>");
+				}
 			}else{
 				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 			}
@@ -54,7 +62,17 @@
 				}
 			if(cked.length==1){
 				var url=arguments[0];
-				confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+				if(cked.prop("placeholder")!=1){
+					confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+				}else{
+					if(${fns:getUser().loginId=='admin'}){
+						confirmx("<spring:message code='confirm_message'/>", url+"&sysDictId="+cked.val());
+					}else{
+						top.$.jBox.tip("<spring:message code='hasnopower_toedit_initianlize.'/>", "<spring:message code='info'/>");
+					}
+					
+				}
+				
 				}
 		}
 			
@@ -295,7 +313,7 @@
 							<tbody>
 							<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
-												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
+												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}" placeholder="${fns:getSysDictInfoById(sysDictInfo.sysDictId).isInitianlize}"></td>
 												<%-- <td>${sysDictInfo.showSequence}</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>