From 374087ca858a629444f31c1d79f129c7aa420dc2 Mon Sep 17 00:00:00 2001 From: wangxin Date: Thu, 30 Aug 2018 16:58:33 +0800 Subject: [PATCH] =?UTF-8?q?(1)=E6=B2=A1=E6=9C=89=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E7=89=B9=E5=AE=9A=E6=9C=8D=E5=8A=A1=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E5=88=B0ztree=E6=A0=91=E7=9A=84=E6=9C=AB=E5=B0=BE=20(2)?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=88=AB=E4=B8=8B=E6=9C=89=E7=89=B9?= =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=97=B6=E5=80=99=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=B8=8E=E6=9C=89=E7=89=B9?= =?UTF-8?q?=E5=AE=9A=E6=9C=8D=E5=8A=A1=E4=B8=80=E8=87=B4=20(3)=E6=A0=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E5=BD=93=E9=A1=B5=E9=9D=A2=E4=B8=8A=E7=9A=84sys:treeselect?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=85=8D=E7=BD=AE=E4=BA=86enableSearch=3D"tr?= =?UTF-8?q?ue"=E5=B1=9E=E6=80=A7=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=90=9C=E7=B4=A2=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/controller/TagController.java | 1 + .../SpecificServiceCfgController.java | 16 ++++++++++++++ .../webapp/WEB-INF/tags/sys/treeselect.tag | 3 ++- .../WEB-INF/views/sys/tagTreeselect.jsp | 22 ++++++++++++++----- 4 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/web/controller/TagController.java b/src/main/java/com/nis/web/controller/TagController.java index 049960d7c..a24b5dd85 100644 --- a/src/main/java/com/nis/web/controller/TagController.java +++ b/src/main/java/com/nis/web/controller/TagController.java @@ -31,6 +31,7 @@ public class TagController extends BaseController { model.addAttribute("title", request.getParameter("title"));//根节点替换文本 model.addAttribute("enableAddBtn", request.getParameter("enableAddBtn"));//节点是否可编辑 model.addAttribute("userId", UserUtils.getUser().getId());//如果启用了addBtn,则使用userId判断是否是用户自己创建的，用户自己创建的节点可删除 + model.addAttribute("enableSearch", request.getParameter("enableSearch"));//是否允许搜索 return "/sys/tagTreeselect"; } diff --git a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java index a9266af14..6f1d18cef 100644 --- a/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java +++ b/src/main/java/com/nis/web/controller/specific/SpecificServiceCfgController.java @@ -242,6 +242,7 @@ public class SpecificServiceCfgController extends BaseController { continue; } if(businessTypeList.size()>0) { + boolean hasBusinessType=false; for(SysDataDictionaryItem business:businessTypeList) { if(String.valueOf(business.getItemCode()).equals(specificServiceCfg.getBusinessType())) { Map map = Maps.newHashMap(); @@ -256,9 +257,24 @@ public class SpecificServiceCfgController extends BaseController { map.put("user",specificServiceCfg.getAddFlag()); } mapList.add(map); + hasBusinessType=true; break; } } + if(!hasBusinessType) {//没有对应的业务类别 + Map map = Maps.newHashMap(); + map.put("id", specificServiceCfg.getSpecServiceId()); + map.put("pId", specificServiceCfg.getParent().getSpecServiceId()); + map.put("name",specificServiceCfg.getSpecServiceName()); + map.put("serviceType",specificServiceCfg.getCfgType()); + map.put("serviceCode",specificServiceCfg.getSpecServiceCode()); + map.put("businessType",specificServiceCfg.getBusinessType()); + map.put("groupId",specificServiceCfg.getGroupId()); + if(specificServiceCfg.getAddFlag()!=null) { + map.put("user",specificServiceCfg.getAddFlag()); + } + mapList.add(map); + } }else { Map map = Maps.newHashMap(); map.put("id", specificServiceCfg.getSpecServiceId()); diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag index 672737077..787da5bb4 100644 --- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag +++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag @@ -27,6 +27,7 @@ <%@ attribute name="checkedPS" type="java.lang.String" required="false" description="复选框选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> <%@ attribute name="unCheckedPS" type="java.lang.String" required="false" description="复选框取消选中时是否关联父子节点，ps关联父子，p关联父，s关联子,都不关联为空"%> <%@ attribute name="enableAddBtn" type="java.lang.Boolean" required="false" description="节点是否可编辑"%> +<%@ attribute name="enableSearch" type="java.lang.Boolean" required="false" description="是否开启节点搜索功能"%>
" data-msg-required="${dataMsgRequired}" placeholder="${empty value?labelValue:value}" @@ -46,7 +47,7 @@ return true; } // 正常打开 - top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}", " ", 320, 420, { + top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&title=${title}&enableAddBtn=${enableAddBtn}&enableSearch=${enableSearch}", " ", 320, 420, { ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"":"ok", "":"clear","":true}, submit:function(v, h, f){ if (v == "ok"){ var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents(); diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp index 4ff6d9515..4c40ec3ee 100644 --- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp +++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp @@ -91,6 +91,14 @@ var nodes = tree.getNodesByParam("level", 1); for(var i=0; i
--> -