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{ 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 ChildrenList = new ArrayList();//字列表 private Date beginDate; // 开始日期 @@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity{ public void setConditionType(List conditionType) { this.conditionType = conditionType; } + public Integer getIsInitianlize() { + return isInitianlize; + } + public void setIsInitianlize(Integer isInitianlize) { + this.isInitianlize = isInitianlize; + } @JsonIgnore public static void sortList(List list, List sourcelist, Integer parentId, boolean cascade){ for (int i=0; i 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("", url+"&mulitId="+mulitId); + if(isinit){ + confirmx("", url+"&mulitId="+mulitId); + }else{ + top.$.jBox.tip("", ""); + } }else{ top.$.jBox.tip("", ""); } @@ -54,7 +62,17 @@ } if(cked.length==1){ var url=arguments[0]; - confirmx("", url+"&sysDictId="+cked.val()); + if(cked.prop("placeholder")!=1){ + confirmx("", url+"&sysDictId="+cked.val()); + }else{ + if(${fns:getUser().loginId=='admin'}){ + confirmx("", url+"&sysDictId="+cked.val()); + }else{ + top.$.jBox.tip("", ""); + } + + } + } } @@ -295,7 +313,7 @@ - + <%-- ${sysDictInfo.showSequence} --%> ${sysDictInfo.itemCode} ${sysDictInfo.itemValue}