bug fix

admin-core/src/main/java/com/ibeetl/admin/core/web/CoreUserController.java

@@ -20,7 +20,6 @@ import com.ibeetl.admin.core.rbac.tree.MenuItem;
 import com.ibeetl.admin.core.rbac.tree.OrgItem;
 import com.ibeetl.admin.core.service.CorePlatformService;
 import com.ibeetl.admin.core.service.CoreUserService;
-import com.ibeetl.admin.core.util.DictUtil;
 import com.ibeetl.admin.core.util.HttpRequestLocal;
 import com.ibeetl.admin.core.web.dto.FunctionNodeView;
 import com.ibeetl.admin.core.web.dto.MenuNodeView;
@@ -41,8 +40,7 @@ public class CoreUserController {
 	@Autowired
 	HttpRequestLocal httpRequestLocal;
 
-	@Autowired
-	DictUtil dictUtil;
+
 
 	
 	@Autowired

admin-core/src/main/resources/sql/core/coreDict.md

@@ -22,7 +22,7 @@ findChildByParent
         *
     FROM core_dict
     WHERE
-    parent = #parentValue# and del_flag = 0 order by sort DESC
+    parent = #id# and del_flag = 0 order by sort DESC
 
 
 bathDelByValue

admin-core/src/main/resources/static/js/lib.js

@@ -203,7 +203,8 @@ var Lib = {
 		value = data.value;
 		if (value != "") {
 			Common.post("/core/dict/viewChildren.json", {
-				"value" : value
+				"value" : value,
+				"group":groupName
 			}, function(serverData) {
 				Lib._resetDictSelect(selects[start], serverData);
 				layuiForm.render();

admin-core/src/main/resources/templates/common/tag/childrenDictSelect.tag.html

-<!--# 
-var dicts = core.dictLevel(type,value!);
-var id=id!(name+"id");
-if(isEmpty(value)){
--->
-
-<!--# for(dict in dicts){ 
- -->
-<div class="${style!'layui-input-inline'}">
-	<!--#if(dictLP.isLast){ /*最后一项字典需要提交，因此需要名称*/  -->
-	<select name="${name}" id="${id}" >
-	<!--# }else{  -->
-	<select>
-	<!--# }  -->
-	<option value="">请选择</option>
-	<!--#
-	if(dictLP.isFirst){ //第一项需要显示完整列表
-	var  allData = core.dictDownQuery(dict.type);//该类型下所有字典
-	for(one in allData){
-	 -->
-     <option value="${one.value}">${one.name}</option>
-    <!--#}
-    } -->
-    </select>
-</div>
-<!--# }  -->
-<!--# }else{ /*提供值的情况下，需要遍历每一项父字典*/  -->
-<!--# for(dict in dicts){ 
- -->
-<div class="${style!'layui-input-inline'}">
-	<!--#if(dictLP.isLast){ /*最后一项字典需要提交，因此需要名称*/  -->
-	<select name="${name}" id="${id}" >
-	<!--# }else{  -->
-	<select>
-	<!--# }  -->
-	<option value="">请选择</option>
-	<!--# 
-	var  allData = core.dictDownQuery(dict.type);//该类型下所有字典
-	var f=dict.value;
-	for(one in allData){
-		if(one.value==f){ //如果有期望值
-	 -->
-     <option value="${one.value}" selected>${one.name}</option>
-     <!--#}else{  -->
-     <option value="${one.value}" >${one.name}</option>
-     <!--#}  -->
-     <!--#}elsefor{  -->
-     <option selected>未配置数据字典:${n}</option>
-    <!--#} -->
-    </select>
-</div>
-
-<!--# }  -->
-<!--# }  -->
\ No newline at end of file

admin-core/src/main/resources/templates/common/tag/searchForm.tag.html

@@ -35,16 +35,7 @@ for(item in items){
     </div>
   
 <!--#}
-case 7:{ //级连数据字典
--->
 
-	<div class="layui-inline select-container">
-      <label class="layui-form-label">${item.name}</label>
-      <layui:childrenDictSelect style='layui-input-inline' type="${item.dict}"  name="${item.fieldName}" 
-				value=""></layui:childrenDictSelect>
-    </div>
-  
-<!--#}
 case 2:{ //日期范围
 -->
 	 <div class="layui-inline">

admin-core/src/main/resources/templates/common/tag/simpleDictSelect.tag.html

@@ -4,10 +4,11 @@
 	<option value="">请选择</option>
 	<!--# 
 		var dicts = [];
-		if(isNotEmpty(type)&&isEmpty(value)){
-			dicts = core.dictDownQuery(type);
-		}else if(isNotEmpty(value)){
-			dicts = core.dictListByValue(value);
+		if(isNotEmpty(type)){
+			dicts = dict.dictDownQuery(type);
+		}else if(isNotEmpty(group)&&isNotEmpty(value)){
+			//级联选择
+			dicts = dict.dictListByValue(group,value);
 		}
 		var expected = value!"";
 		for(dict in dicts){