sys_dict_info 新增is_initianlize字段(是否为初始化数据),不得删除初始化数据,仅admin可修改
This commit is contained in:
@@ -30,6 +30,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
|
|||||||
private SysUser sysDictEditor; //editor_id 修改人员 int Y 取自sys_user.id
|
private SysUser sysDictEditor; //editor_id 修改人员 int Y 取自sys_user.id
|
||||||
private Date editTime; //edit_time 修改时间 date Y
|
private Date editTime; //edit_time 修改时间 date Y
|
||||||
private Integer levelNo; //层级
|
private Integer levelNo; //层级
|
||||||
|
private Integer isInitianlize; //是否为初始化数据 0:否 1:是
|
||||||
private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
|
private List<ServiceDictInfo> ChildrenList = new ArrayList<ServiceDictInfo>();//字列表
|
||||||
|
|
||||||
private Date beginDate; // 开始日期
|
private Date beginDate; // 开始日期
|
||||||
@@ -167,6 +168,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
|
|||||||
public void setConditionType(List<Integer> conditionType) {
|
public void setConditionType(List<Integer> conditionType) {
|
||||||
this.conditionType = conditionType;
|
this.conditionType = conditionType;
|
||||||
}
|
}
|
||||||
|
public Integer getIsInitianlize() {
|
||||||
|
return isInitianlize;
|
||||||
|
}
|
||||||
|
public void setIsInitianlize(Integer isInitianlize) {
|
||||||
|
this.isInitianlize = isInitianlize;
|
||||||
|
}
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
|
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
|
||||||
for (int i=0; i<sourcelist.size(); i++){
|
for (int i=0; i<sourcelist.size(); i++){
|
||||||
|
|||||||
@@ -43,7 +43,8 @@
|
|||||||
s.creator_id AS "sysDictCreator.id",
|
s.creator_id AS "sysDictCreator.id",
|
||||||
s.create_time AS createTime,
|
s.create_time AS createTime,
|
||||||
s.editor_id AS "sysDictEditor.id",
|
s.editor_id AS "sysDictEditor.id",
|
||||||
s.edit_time AS editTime
|
s.edit_time AS editTime,
|
||||||
|
s.is_initianlize AS isInitianlize
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<sql id="menuJoins">
|
<sql id="menuJoins">
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ public class SysDictInfoService extends BaseService{
|
|||||||
sysDictInfo.setCreateTime(new Date());
|
sysDictInfo.setCreateTime(new Date());
|
||||||
sysDictInfo.setSysDictEditor(user);
|
sysDictInfo.setSysDictEditor(user);
|
||||||
sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
|
sysDictInfo.setEditTime(sysDictInfo.getCreateTime());
|
||||||
|
sysDictInfo.setIsInitianlize(0);//是否为初始化数据,默认为0:否
|
||||||
sysDictInfoDao.insertDict(sysDictInfo);
|
sysDictInfoDao.insertDict(sysDictInfo);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,13 +31,21 @@
|
|||||||
function cmd(){
|
function cmd(){
|
||||||
var url=arguments[0];
|
var url=arguments[0];
|
||||||
var mulitId="";
|
var mulitId="";
|
||||||
|
var isinit = true;
|
||||||
jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){
|
jQuery("#treeTable").find(":checkbox:checked[name='check']").each(function(){
|
||||||
if(jQuery(this).val()!=""){
|
if(jQuery(this).val()!=""){
|
||||||
|
if(jQuery(this).prop("placeholder")==1){
|
||||||
|
isinit = false;
|
||||||
|
}
|
||||||
mulitId+=jQuery(this).val()+",";
|
mulitId+=jQuery(this).val()+",";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
if(mulitId!=""){
|
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{
|
}else{
|
||||||
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
|
||||||
}
|
}
|
||||||
@@ -54,7 +62,17 @@
|
|||||||
}
|
}
|
||||||
if(cked.length==1){
|
if(cked.length==1){
|
||||||
var url=arguments[0];
|
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>
|
<tbody>
|
||||||
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
||||||
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
<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>${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 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>${sysDictInfo.itemValue}</td>
|
||||||
|
|||||||
Reference in New Issue
Block a user