公告页面和选择部门修改

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -94,11 +94,20 @@ public class OaNotifyController extends BaseController {
 	public List<Map<String, Object>> treeDataNotify(){
 		List<Map<String, Object>> mapList = Lists.newArrayList();
 		List<MainDictDetail> type = DictUtils.getMainDictList("oa_notify_type");
-		for (int i = 0; i < type.size(); i++) {
-			Map<String, Object> map = new HashMap<>();
-			map.put("id",type.get(i).getValue());
-			map.put("name", type.get(i).getLabel());
-			mapList.add(map);
+		if(type.size()>0){
+			Map<String, Object> mapParent = new HashMap<>();
+			mapParent.put("id","");
+			mapParent.put("name", "公告类型");
+			mapParent.put("isParent", true);
+			mapList.add(mapParent);
+
+			for (int i = 0; i < type.size(); i++) {
+				Map<String, Object> map = new HashMap<>();
+				map.put("id",type.get(i).getValue());
+				map.put("name", type.get(i).getLabel());
+				map.put("isParent", false);
+				mapList.add(map);
+			}
 		}
 		return mapList;
 	}

src/main/webapp/WEB-INF/tags/sys/treeselectoffices.tag

@@ -31,7 +31,7 @@
 	       		 <button style="font-size:14px;" type="button"  id="${id}Button" class="nav-btn nav-btn-add ${disabled} ${hideBtn ? 'hide' : ''}"><i class="fa fa-search"></i>&nbsp;选择
 	             </button>
        		 </span>
-       		
+
     </div>
 	 <label id="${id}Name-error" class="error" for="${id}Name" style="display:none"></label>
 <script type="text/javascript">
@@ -81,6 +81,12 @@
 						top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
 						return false;
 					}//</c:if>
+					if ((nodes[i].pId)==("7f776d072d7b4c839cef4e63ce6dbfa5")){
+						ids.push(nodes[1].id);
+						var fName = '';
+						fName = createFName(nodes[1],fName);
+						parentIds.push(fName);
+					}
 					ids.push(nodes[i].id);
 					<c:if test="${retnParent}">
 					var fName = '';
@@ -97,68 +103,6 @@
 				//按钮【按钮二】的回调
 			}
 		});
-
-		    type: 2,
-		    area: ['300px', '420px'],
-		    title:"选择${title}",
-		    ajaxData:{selectIds: $("#${id}Id").val()},
-		    content: "${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}&flagOffice=${flagOffice}&selectIds="+selectIds ,
-		    btn: ['确定', '关闭']
-    	       ,yes: function(index, layero){ //或者使用btn1
-						var tree = layero.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
-						var ids = [], names = [],parentIds=[], nodes = [];
-						if ("${checked}" == "true"){
-							nodes = tree.getCheckedNodes(true);
-						}else{
-							nodes = tree.getSelectedNodes();
-						}
-						for(var i=0; i<nodes.length; i++) {//<c:if test="${checked && notAllowSelectParent}">
-							if (nodes[i].isParent){
-								continue; // 如果为复选框选择，则过滤掉父节点
-							}//</c:if><c:if test="${notAllowSelectRoot}">
-							if (nodes[i].level == 0){
-								//top.$.jBox.tip("不能选择根节点（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择根节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}//</c:if><c:if test="${notAllowSelectParent}">
-							if (nodes[i].isParent){
-								//top.$.jBox.tip("不能选择父节点（"+nodes[i].name+"）请重新选择。");
-								//layer.msg('有表情地提示');
-								top.layer.msg("不能选择父节点（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}//</c:if><c:if test="${not empty module && selectScopeModule}">
-							if (nodes[i].module == ""){
-								//top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
-								top.layer.msg("不能选择公共模型（"+nodes[i].name+"）请重新选择。", {icon: 0});
-								return false;
-							}else if (nodes[i].module != "${module}"){
-								//top.$.jBox.tip("不能选择当前栏目以外的栏目模型，请重新选择。");
-								top.layer.msg("不能选择当前栏目以外的栏目模型，请重新选择。", {icon: 0});
-								return false;
-							}//</c:if>
-							if ((nodes[i].pId)==("7f776d072d7b4c839cef4e63ce6dbfa5")){
-								ids.push(nodes[1].id);
-								var fName = '';
-								fName = createFName(nodes[1],fName);
-								parentIds.push(fName);
-							}
-							ids.push(nodes[i].id);
-                            <c:if test="${retnParent}">
-                            var fName = '';
-                            fName = createFName(nodes[i],fName);
-                            parentIds.push(fName);
-                            </c:if>
-							names.push(nodes[i].name);//<c:if test="${!checked}">
-							break; // 如果为非复选框选择，则返回第一个选择  </c:if>
-						}
-						changeOffice(ids,names,parentIds);
-						top.layer.close(index);
-				    	       },
-    	cancel: function(index){ //或者使用btn2
-    	           //按钮【按钮二】的回调
-    	       }
-		});
-
 	});
 	function createFName(node,fName) {
 		var parentNode = node.getParentNode();