主题信息分类与业务领域分类字段逻辑修改

部署环境切换107和测试数据库

cn.com.taiji.myapp/src/main/java/cn/com/taiji/sysmanage/service/TreeService.java

@@ -17,6 +17,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -105,7 +106,7 @@ public class TreeService {
 		return menuTreeList;
 	}
 
-
+
 	public List<MenuTree> getAllMenu(boolean flag) {
 		
 		String sql="select m.issensivite, m.menu_id,m.menu_name,m.menu_url,m.PARENT_ID,m.icon_cls "
@@ -595,14 +596,17 @@ List<MenuTree> menuTreeList = jdbcTemplate.query(sql, new Object[]{},
 		return menuTreeList;
 		
 	}
-	public List<MenuTree> getResTreeByUserId(String id,User userInfo,String param) {
+	public List<MenuTree> getResTreeByUserId(String id,User userInfo,String param,String type) {
 		// TODO Auto-generated method stub
 	   
 		String sql="";
 		 List<MenuTree> menuTreeList = new ArrayList<MenuTree>();
 		if(id.equals("0")){
 			String paramstr="((presid in ('bm','7b38ff824c344c30af09ef40cf0eedac','8012344641b74b8ca57879147e5746bd') or presid is null or presid='') and resid not in ('jc','zt') or exists (select res.res_id from dept_user p,dept_res res where p.dept_id=res.dept_id and res.res_id=t_res_classify.resid and p.user_id='"+userInfo.getUserId()+"')) ";
-			if("1".equals(param)) {
+			if (StringUtils.isNotEmpty(type)){
+				paramstr="resid  = '"+type + "' ";
+			}
+			else if("1".equals(param)) {
 				paramstr="resid  in ('jc','zt') ";
 			}
 			 sql="select  resid,presid,resname,rescode,getParentList(resid) ywbmname from t_res_classify where state='0' and  "+paramstr+"   order by indexnum"

cn.com.taiji.myapp/src/main/java/cn/com/taiji/sysmanage/web/TreeController.java

@@ -324,7 +324,7 @@ public class TreeController {
 		String id = request.getParameter("id")==null?"0":request.getParameter("id");
 		HttpSession session = request.getSession();
 		User userInfo = (User) session.getAttribute("user");
-		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"0");
+		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"0","");
         List<TreeGrid> nodes = TreeNodeUtil.toListTreeGrid(menus);
         List<TreeGrid> treeNodes = TreeNodeUtil.treeGrid(nodes, id);
         return treeNodes;
@@ -364,24 +364,25 @@ public class TreeController {
 	@RequestMapping(value="resGridViewByUserId")
 	public @ResponseBody List<TreeGrid> resGridView(HttpServletRequest request,HttpServletResponse response){
 		String id = request.getParameter("id")==null?"0":request.getParameter("id");
+		String type=request.getParameter("type");
 		HttpSession session = request.getSession();
 		User userInfo = (User) session.getAttribute("user");
-		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"1");
+		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"1",type);
         List<TreeGrid> nodes = TreeNodeUtil.toListTreeGrid(menus);
         List<TreeGrid> treeNodes = TreeNodeUtil.treeGrid(nodes, id);
         return treeNodes;
     }
-
+
 	@RequestMapping(value="resTreeNodeViewByUserId")
 	public @ResponseBody List<TreeNode> resTreeNodeViewByUserId(HttpServletRequest request,HttpServletResponse response){
 		String id = request.getParameter("id")==null?"0":request.getParameter("id");
 		HttpSession session = request.getSession();
 		User userInfo = (User) session.getAttribute("user");
-		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"0");
+		List<MenuTree> menus = treeService.getResTreeByUserId(id,userInfo,"0","");
         List<TreeNode> nodes = TreeNodeUtil.toListNode(menus);
         List<TreeNode> treeNodes = TreeNodeUtil.tree(nodes, id);
         return treeNodes;
-	}
+	}
 	@RequestMapping(value="resTreeNodeViewByDeptId")
 	public @ResponseBody Map<String,Object> resTreeNodeViewByDeptId(Model model,HttpServletRequest request,HttpServletResponse response){
 		 String id = request.getParameter("id") ;

cn.com.taiji.myapp/src/main/resources/application.properties

@@ -114,4 +114,4 @@ viewrole=
 aksk=gxwzgxwz
 breakpoint.upload.chunkSize=5242880
 #sso配置地址
-ssoAddress=http://200.1.70.44:8088/authn-api/v5/cas/518130388732796928/logout?service=http://200.1.70.150:8273/login
+ssoAddress=http://200.1.70.44:8088/authn-api/v5/cas/518130388732796928/logout?service=http://200.1.70.107:8273/login

cn.com.taiji.system/src/main/java/cn/com/taiji/workflow/web/XxlZcFlowController.java

@@ -10,11 +10,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import cn.com.taiji.zhongxiao.domain.*;
+import cn.com.taiji.zhongxiao.service.*;
 import org.activiti.engine.ActivitiObjectNotFoundException;
 import org.activiti.engine.ActivitiTaskAlreadyClaimedException;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,23 +35,9 @@ import cn.com.taiji.sys.service.UserService;
 import cn.com.taiji.util.ToolUtil;
 import cn.com.taiji.workflow.dto.LocalComment;
 import cn.com.taiji.workflow.service.WorkflowService;
-import cn.com.taiji.zhongxiao.domain.ApplyClass;
-import cn.com.taiji.zhongxiao.domain.CommonAduitrecord;
-import cn.com.taiji.zhongxiao.domain.TbusinessItemAndInfoClass;
-import cn.com.taiji.zhongxiao.domain.TinfoClass;
-import cn.com.taiji.zhongxiao.domain.TinfoclassRes;
-import cn.com.taiji.zhongxiao.domain.TsystemInfoAndInfoClass;
 import cn.com.taiji.zhongxiao.dto.TinfoClassDto;
 import cn.com.taiji.zhongxiao.dto.TshareApplyDto;
-import cn.com.taiji.zhongxiao.service.BusinessProcessService;
-import cn.com.taiji.zhongxiao.service.CommonAduitrecordService;
-import cn.com.taiji.zhongxiao.service.DbdcCodeService;
-import cn.com.taiji.zhongxiao.service.SceneRelationService;
-import cn.com.taiji.zhongxiao.service.TbusinessItemAndInfoClassService;
-import cn.com.taiji.zhongxiao.service.TinfoClassService;
-import cn.com.taiji.zhongxiao.service.TpowerResponsibilityService;
-import cn.com.taiji.zhongxiao.service.TshareApplyService;
-import cn.com.taiji.zhongxiao.service.TsystemInfoAndInfoClassService;
+
 /**
  * 
  * 类名称：XxlZcFlowController   
@@ -90,6 +79,8 @@ public class XxlZcFlowController {
     TbusinessItemAndInfoClassService tbusinessItemAndInfoClassService;
     @Inject
     CommonAduitrecordService commonAduitrecordService;
+	@Inject
+	TresClassifyService tresClassifyService;
     
     @RequestMapping("/tinfoclass_tyinfo")
     public String tinfoclass_tyinfo(String busId,String checkstate,
@@ -202,6 +193,15 @@ public class XxlZcFlowController {
 	    zyflid+=res.getTresClassify().getResid()+",";
 	    zyflname+=res.getTresClassify().getResname()+",";
 	}
+	String ywlyflid = busInfo.getYwlyfl();
+	String ywlyflname = "";
+	if (StringUtils.isNotEmpty(ywlyflid)){
+		String ywlyArrar[] =ywlyflid.split(",");
+		for (int i=0;i<ywlyArrar.length;i++){
+			TresClassify tresClassify = tresClassifyService.findTresClassifyById(ywlyArrar[i]);
+			ywlyflname += tresClassify.getResname()+",";
+		}
+	}
 	if(task.getName().equals("编目人员修改")){
 	    List<CodeDto> list = dbdcCodeService.findCodeByCodeType("xxzygs");//获取信息资源格式
 		List<CodeDto> gxpllist = dbdcCodeService.findCodeByCodeType("gxpl");//获取更新频率
@@ -235,6 +235,9 @@ public class XxlZcFlowController {
 	
 	model.addAttribute("zyflname", zyflname);
 	model.addAttribute("zyflid", zyflid);
+	model.addAttribute("ywlyflname",ywlyflname);
+	model.addAttribute("ywlyflid",ywlyflid);
+
 	model.addAttribute("info", busInfo);
 	model.addAttribute("taskId", taskId);
 	model.addAttribute("taskName", task.getName());

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/service/TinfoClassService.java

@@ -1024,9 +1024,9 @@ public class TinfoClassService {
 	      else if("mysql".equals(database_type)){
 		  
 		  //获取到当前分类的所有子节点
-		  String lastResIds="('"+resid+"',";
+		  String lastResIds=resid+",";
 			List<Map<String,Object>> menuTreeList=new ArrayList<Map<String,Object>>();
-			String sql2="select resid from t_res_classify where presid=?";
+			String sql2="select resid from t_res_classify where state=0 and  presid=?";
 			menuTreeList = resInfo(sql2,resid);
 			List<Map<String,Object>> templist=menuTreeList;
 			Map<String,Object> map = new HashMap<String,Object>(); 
@@ -1048,15 +1048,17 @@ public class TinfoClassService {
 			  
 		  }
 			for (Map.Entry<String,Object> entry : map.entrySet()) {
-			    lastResIds=lastResIds+"'"+entry.getValue()+"'"+",";
+			    lastResIds=lastResIds+entry.getValue()+",";
 				 }
 			if(lastResIds.length()>1){
 			    lastResIds=lastResIds.substring(0, lastResIds.length()-1);
-			    lastResIds=lastResIds+")";
+			    lastResIds=lastResIds;
 			}
 		//获取资源所属分类
-			sql.append("and ( p.infotypeid in ").append(lastResIds).append("  )");//or p.id in (SELECT q.tinfoclassid FROM t_infoclass_res_detail q where q.resid=?)
-			//paramList.add(resid);   
+//			sql.append("and ( p.infotypeid in ").append(lastResIds).append("  )");//or p.id in (SELECT q.tinfoclassid FROM t_infoclass_res_detail q where q.resid=?)
+			//paramList.add(resid);
+			sql.append("and ( p.id in (SELECT q.tinfoclassid FROM t_infoclass_res_detail q where q.resid='"+resid+"') " +
+					"or ARRAY[string_to_array(ywlyfl, ',')]&&ARRAY[string_to_array('"+lastResIds+"', ',')])");
 	      }
 		  //
 	      }
@@ -1793,7 +1795,7 @@ public class TinfoClassService {
 				 paramList.add(s.substring(0, s.length()-1)+"");
 			     }
 			     else if("mysql".equals(database_type)){
-				 sql.append("and  infoname REGEXP ? ");
+				 sql.append("and  infoname ~ ? ");
 				 paramList.add(s.substring(0, s.length()-1)+""); 
 			     }
 			 }

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/TinfoClassController.java

@@ -28,7 +28,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import cn.com.taiji.util.*;
+import cn.com.taiji.zhongxiao.domain.*;
 import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -55,16 +57,6 @@ import cn.com.taiji.sys.dto.UserDto;
 import cn.com.taiji.sys.service.DeptService;
 import cn.com.taiji.sys.service.UserService;
 import cn.com.taiji.workflow.service.WorkflowService;
-import cn.com.taiji.zhongxiao.domain.CommonAduitrecord;
-import cn.com.taiji.zhongxiao.domain.ReqdataitemXxx;
-import cn.com.taiji.zhongxiao.domain.RequireBMTask;
-import cn.com.taiji.zhongxiao.domain.TbusinessItemAndInfoClass;
-import cn.com.taiji.zhongxiao.domain.TcodeSet;
-import cn.com.taiji.zhongxiao.domain.TdataMeta;
-import cn.com.taiji.zhongxiao.domain.TinfoClass;
-import cn.com.taiji.zhongxiao.domain.TinfoclassDatameta;
-import cn.com.taiji.zhongxiao.domain.TinfoclassRes;
-import cn.com.taiji.zhongxiao.domain.TsystemInfoAndInfoClass;
 import cn.com.taiji.zhongxiao.dto.DelayDataShareInfo;
 import cn.com.taiji.zhongxiao.dto.DelayInfo;
 import cn.com.taiji.zhongxiao.dto.DelayServiceShareInfo;
@@ -1820,6 +1812,16 @@ public class TinfoClassController {
 			zyflid += res.getTresClassify().getResid() + ",";
 			zyflname += res.getTresClassify().getResname() + ",";
 		}
+		String ywlyflid = info.getYwlyfl();
+		String ywlyflname = "";
+		if (StringUtils.isNotEmpty(ywlyflid)){
+			String ywlyArrar[] =ywlyflid.split(",");
+			for (int i=0;i<ywlyArrar.length;i++){
+				TresClassify tresClassify = tresClassifyService.findTresClassifyById(ywlyArrar[i]);
+				ywlyflname += tresClassify.getResname()+",";
+			}
+		}
+
 		List<TsystemInfoAndInfoClass> systeminfoList = tsystemInfoAndInfoClassService
 				.findTsystemInfoAndInfoClassByClassId(id);
 		List<TbusinessItemAndInfoClass> businessItemList = tbusinessItemAndInfoClassService
@@ -1838,6 +1840,8 @@ public class TinfoClassController {
 		}
 		model.addAttribute("zyflname", zyflname);
 		model.addAttribute("zyflid", zyflid);
+		model.addAttribute("ywlyflname",ywlyflname);
+		model.addAttribute("ywlyflid",ywlyflid);
 		model.addAttribute("info", info);
 		model.addAttribute("list", list);
 		model.addAttribute("gxpllist", gxpllist);
@@ -1888,6 +1892,15 @@ public class TinfoClassController {
 			zyflid += res.getTresClassify().getResid() + ",";
 			zyflname += res.getTresClassify().getResname() + ",";
 		}
+		String ywlyflid = info.getYwlyfl();
+		String ywlyflname = "";
+		if (StringUtils.isNotEmpty(ywlyflid)){
+			String ywlyArrar[] =ywlyflid.split(",");
+			for (int i=0;i<ywlyArrar.length;i++){
+				TresClassify tresClassify = tresClassifyService.findTresClassifyById(ywlyArrar[i]);
+				ywlyflname += tresClassify.getResname()+",";
+			}
+		}
 		List<TsystemInfoAndInfoClass> systeminfoList = tsystemInfoAndInfoClassService
 				.findTsystemInfoAndInfoClassByClassId(id);
 		List<TbusinessItemAndInfoClass> businessItemList = tbusinessItemAndInfoClassService
@@ -1910,6 +1923,8 @@ public class TinfoClassController {
 		model.addAttribute("systeminfoid", systeminfoid);
 		model.addAttribute("zyflname", zyflname);
 		model.addAttribute("zyflid", zyflid);
+		model.addAttribute("ywlyflname",ywlyflname);
+		model.addAttribute("ywlyflid",ywlyflid);
 		model.addAttribute("info", info);
 		model.addAttribute("bgid", bgid);
 		model.addAttribute("bgflag", bgflag);
@@ -1945,6 +1960,15 @@ public class TinfoClassController {
 			zyflid += res.getTresClassify().getResid() + ",";
 			zyflname += res.getTresClassify().getResname() + ",";
 		}
+		String ywlyflid = info.getYwlyfl();
+		String ywlyflname = "";
+		if (StringUtils.isNotEmpty(ywlyflid)){
+			String ywlyArrar[] =ywlyflid.split(",");
+			for (int i=0;i<ywlyArrar.length;i++){
+				TresClassify tresClassify = tresClassifyService.findTresClassifyById(ywlyArrar[i]);
+				ywlyflname += tresClassify.getResname()+",";
+			}
+		}
 		List<TsystemInfoAndInfoClass> systeminfoList = tsystemInfoAndInfoClassService
 				.findTsystemInfoAndInfoClassByClassId(id);
 		List<TbusinessItemAndInfoClass> businessItemList = tbusinessItemAndInfoClassService
@@ -1968,6 +1992,8 @@ public class TinfoClassController {
 
 		model.addAttribute("zyflname", zyflname);
 		model.addAttribute("zyflid", zyflid);
+		model.addAttribute("ywlyflname",ywlyflname);
+		model.addAttribute("ywlyflid",ywlyflid);
 		loginfoService.logDealInfo("3", modelType, "信息类查看", "t_infoclass", id, ToolUtil.getIpAddr(request),
 				request.getRequestURI(), userInfo);
 		String zfbm = "否";
@@ -1995,6 +2021,7 @@ public class TinfoClassController {
 	public String tinfoclassSave(Model model, TinfoClassDto dto,
 
 			HttpServletRequest request, HttpServletResponse response) {
+		String ywlyid=request.getParameter("ywlyflid");
 		String qzqd = request.getParameter("qzqd");
 		String qzqdid = request.getParameter("qzqdid");
 		String[] isprimary = request.getParameterValues("isprimary");
@@ -2045,6 +2072,7 @@ public class TinfoClassController {
 		String bgflag = request.getParameter("bgflag");
 		String precode = "";
 		String seqcode = "";
+		dto.setYwlyfl(ywlyid);
 		if (dto.getId() == null || "".equals(dto.getId())) {// 新增
 			if (iszgbmbz) {
 				dto.setIszgbmbz("1");

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/web/TresClassifyController.java

@@ -191,9 +191,15 @@ public class TresClassifyController {
     @RequestMapping("/resClassify_check")
     public String resClassifyCheck(Model model,
 	    HttpServletRequest request, HttpServletResponse response) {
-	
-	return "thymeleaf/tresClassify/resClassify_grid";
+    	String type = request.getParameter("type");
+    	if ("ywlyfl".equals(type)){
+    		return "thymeleaf/tresClassify/resClassify_grid_ywlyfl";
+		}else {
+			return "thymeleaf/tresClassify/resClassify_grid";
+		}
+
     }
+
     @RequestMapping("/resClassify_edit{id}")
     public String resClassifyEdit(@PathVariable("id")String id,Model model,
 	    HttpServletRequest request, HttpServletResponse response) {

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_add.js

@@ -170,9 +170,9 @@ $(document).ready(function(){
 		}
 		
 	}) 
-	
+	//主题信息分类
 	$("#glzyfl").bind("click",function(){
-		var dgurl="../resClassify/resClassify_check";
+		var dgurl="../resClassify/resClassify_check?type=glzyfl";
 		var index=layer.open({
 			  type: 2, 
 			  move: false,
@@ -184,6 +184,20 @@ $(document).ready(function(){
 			});
 		layer.full(index);
 	});
+	//业务领域分类
+	$("#ywlyfl").bind("click",function(){
+		var dgurl="../resClassify/resClassify_check?type=ywlyfl";
+		var index=layer.open({
+			type: 2,
+			move: false,
+			area: [($(window).width()-80)+'px', ($(window).height()-80)+'px'],
+			offset: '50px',
+			shadeClose: true ,
+			title : '资源分类',
+			content: dgurl //这里content是一个URL，如果你不想让iframe出现滚动条，你还可以content: ['http://sentsin.com', 'no']
+		});
+		layer.full(index);
+	});
 	/**
 	 * 资源分类选择页面
 	 */

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_bg.js

@@ -275,7 +275,7 @@ $(document).ready(function(){
 		
 	}) 
 	$("#glzyfl").bind("click",function(){
-		var dgurl="../resClassify/resClassify_check";
+		var dgurl="../resClassify/resClassify_check?type=glzyfl";
 		var index = layer.open({
             type: 2,
             title: "资源分类",
@@ -287,6 +287,19 @@ $(document).ready(function(){
             }
           });
 	});
+	$("#ywlyfl").bind("click",function(){
+		var dgurl="../resClassify/resClassify_check?type=ywlyfl";
+		var index = layer.open({
+			type: 2,
+			title: "资源分类",
+			content:  dgurl ,
+			area: [($(window).width()-80)+'px', ($(window).height()-80)+'px'],
+			maxmin: true,
+			end:function(index, layero){
+				layer.close(index)
+			}
+		});
+	});
 //$("#providename").bind("click",function(){
 //		
 //		var dgurl="../tinfoclass/dept_choose?type=1";

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_edit.js

@@ -264,7 +264,7 @@ $(document).ready(function(){
 		
 	}) 
 	$("#glzyfl").bind("click",function(){
-		var dgurl="../resClassify/resClassify_check";
+		var dgurl="../resClassify/resClassify_check?type=glzyfl";
 		var index=layer.open({
 			  type: 2, 
 			  move: false,
@@ -275,6 +275,18 @@ $(document).ready(function(){
 			  content: dgurl //这里content是一个URL，如果你不想让iframe出现滚动条，你还可以content: ['http://sentsin.com', 'no']
 			});
 	});
+	$("#ywlyfl").bind("click",function(){
+		var dgurl="../resClassify/resClassify_check?type=ywlyfl";
+		var index=layer.open({
+			type: 2,
+			move: false,
+			area: [($(window).width()-80)+'px', ($(window).height()-80)+'px'],
+			offset: '50px',
+			shadeClose: true ,
+			title : '资源分类',
+			content: dgurl
+		});
+	});
 	/**
 	 * 提供方选择页面
 	 */

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_add.html

@@ -124,7 +124,9 @@
                     </tr>
                     <tr>
                         <th><font class="fontred">*</font>业务领域分类</th>
-                        <td colspan="3"><input type="text" name="ywlyfl" id="ywlyfl" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/></td>
+<!--                        <td colspan="3"><input type="text" name="ywlyfl" id="ywlyfl" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/></td>-->
+                        <td colspan="3"><input type="text" placeholder="点击选择业务领域分类" readonly="true" name="ywlyfl" id="ywlyfl" class="input-normal input-wdl" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" /></td>
+                        <input type="hidden" name="ywlyflid" id="ywlyflid" class="input-normal input-wdl  " />
                     </tr>
                     <tr>
                        <th><font class="fontred"></font>数据资源描述</th>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_auditPage.html

@@ -150,8 +150,8 @@
                     </tr>
                     <tr>
                      <th><font class="fontred">*</font>业务领域分类</th>
- 					<td colspan="3" th:text="${info.ywlyfl}">
- 					</td>
+                        <td colspan="3"><input type="text" readonly="true" name="ywlyfl" id="ywlyfl" th:value="${ywlyflname}" class="input-normal input-wdl  " /></td>
+                        <input type="hidden" name="ywlyflid" id="ywlyflid" th:value="${ywlyflid}" class="input-normal input-wdl  " />
                     </tr>
                     <tr>
                         <th><font class="fontred">*</font>数据资源描述</th>
@@ -457,9 +457,8 @@
 
                  <tr>
                      <th><font class="fontred">*</font>业务领域分类</th>
-                     <td colspan="3">
-                         <input type="text" name="ywlyfl" id="ywlyfl" th:value="${info.ywlyfl}" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/>
-                     </td>
+                     <td><input type="text" readonly="true" name="ywlyfl" id="ywlyfl" th:value="${ywlyflname}" class="input-normal input-wdl" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" /></td>
+                     <input type="hidden" name="ywlyflid" id="ywlyflid" th:value="${ywlyflid}"  />
                  </tr>
 
                  <tr>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_bg.html

@@ -135,9 +135,8 @@
 
                     <tr>
                         <th><font class="fontred">*</font>业务领域分类</th>
-                        <td colspan="3">
-                            <input type="text" name="ywlyfl" id="ywlyfl" th:value="${info.ywlyfl}" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/>
-                        </td>
+                        <td><input type="text" readonly="true" name="ywlyfl" id="ywlyfl" th:value="${ywlyflname}" class="input-normal input-wdl" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" /></td>
+                        <input type="hidden" name="ywlyflid" id="ywlyflid" th:value="${ywlyflid}"  />
                     </tr>
 
                     <tr>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_edit.html

@@ -130,13 +130,15 @@
 
                  <tr>
                      <th><font class="fontred">*</font>业务领域分类</th>
-                     <td colspan="3">
-                         <input type="text" name="ywlyfl" id="ywlyfl" th:value="${info.ywlyfl}" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/>
-                     </td>
+<!--                     <td colspan="3">-->
+<!--                         <input type="text" name="ywlyfl" id="ywlyfl" th:value="${info.ywlyfl}" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符"/>-->
+<!--                     </td>-->
+                     <td colspan="3"><input type="text" readonly="true" name="ywlyfl" id="ywlyfl" th:value="${ywlyflname}" class="input-normal input-wdl" datatype="*1-200" nullmsg="必填" sucmsg="&nbsp;" /></td>
+                     <input type="hidden" name="ywlyflid" id="ywlyflid" th:value="${ywlyflid}"  />
                  </tr>
 
                  <tr>
-                     <th><font class="fontred">*</font>数据资源描述</th>
+                     <th><font class="fontred"></font>数据资源描述</th>
                      <td colspan="3">
                          <input type="text" name="infoabstracts" th:value="${info.infoabstracts}" id="infoabstracts" class="input-normal input-wdl  " datatype="*1-400" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过400个字符" />
                      </td>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_view.html

@@ -87,8 +87,8 @@
                  </tr>
                  <tr>
                      <th><font class="fontred">*</font>业务领域分类</th>
-                     <td colspan="3" th:text="${info.ywlyfl}">
-                     </td>
+                     <td colspan="3"><input type="text" readonly="true" name="ywlyfl" id="ywlyfl" th:value="${ywlyflname}" class="input-normal input-wdl  " /></td>
+                     <input type="hidden" name="ywlyflid" id="ywlyflid" th:value="${ywlyflid}" class="input-normal input-wdl  " />
                  </tr>
                  <tr>
                      <th><font class="fontred">*</font>数据资源描述</th>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tresClassify/resClassify_grid.html

@@ -24,7 +24,7 @@
     <script th:inline="javascript">
     /*<![CDATA[*/ 
     	    $('#tt').treegrid({
-    url:'../tree/resGridViewByUserId',
+    url:'../tree/resGridViewByUserId?type=jc',
     idField:'id',
     toolbar:'#toolbar',
     treeField:'name',

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tresClassify/resClassify_grid_ywlyfl.html

@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8"/>
+<title>资源选择</title>
+<link rel="stylesheet" type="text/css" th:href="@{/easyui/easyui/1.5.3/themes/default/easyui.css}" />
+<link rel="stylesheet" type="text/css" th:href="@{/easyui/css/wu.css}" />
+<link rel="stylesheet" type="text/css" th:href="@{/easyui/css/icon.css}" />
+<script type="text/javascript" th:src="@{/easyui/js/jquery-1.8.0.min.js}"></script>
+<script type="text/javascript" th:src="@{/easyui/easyui/1.5.3/jquery.easyui.min.js}"></script>
+<script type="text/javascript" th:src="@{/easyui/easyui/1.5.3/locale/easyui-lang-zh_CN.js}"></script>
+
+		<script type="text/javascript" th:src="@{/layer/layer.js}"></script>
+</head>
+<body class="easyui-layout">
+
+<table id="tt" class="easyui-treegrid" style="width:100%;height:100%"
+       >
+</table>
+
+ <div id="toolbar">
+        <a href="javascript:void(0);" class="easyui-linkbutton" iconCls="icon-add" plain="true" onclick="formatCheck()">提交</a>
+    </div>
+    <script th:inline="javascript">
+    /*<![CDATA[*/ 
+    	    $('#tt').treegrid({
+    url:'../tree/resGridViewByUserId?type=zt',
+    idField:'id',
+    toolbar:'#toolbar',
+    treeField:'name',
+    animate:true,
+    checkbox:false,
+    onClickRow:nodeClick,
+    onLoadSuccess:nodeCheck,
+    cascadeCheck:false,
+    columns:[[
+		{title:'资源分类名称',field:'name',width:300},
+		{title:'资源分类编码',field:'url',width:300,align:'left'},
+		{title:'选择',field:'id',formatter:formatAction,align:'left'}
+    ]]
+});
+    	    function nodeClick(row){
+    	    	
+    	   	 $('#tt').treegrid('expand',row.id);
+    	       }
+    var flag=true;
+	function formatCheck(){ 
+		var checkid="";
+		var checkname="";
+		$("input[name='xz']:checkbox:checked").each(function(){ 
+			checkid+=$(this).val(); 
+        	checkname+=$(this).attr("resname");
+        	checkid+=",";
+        	checkname+=",";
+			}); 
+       
+        if(checkid==""){
+        	layer.msg('请勾选相应分类', {icon: 6});
+        }
+        else{
+        	if(flag){
+        		flag=false;
+        		parent.document.getElementById('ywlyflid').value=checkid;
+        		parent.document.getElementById('ywlyfl').value=checkname;
+        		var index = parent.layer.getFrameIndex(window.name);  
+                parent.layer.close(index);
+        	}
+        	else{
+        		layer.msg('数据提交中，请稍后。。', {icon: 6});
+        	}
+        	
+        }
+		}
+
+    //选中节点的回显
+    function nodeCheck(){
+    	var checkid = parent.document.getElementById('ywlyflid').value;
+    	var checkids=checkid.split(",");
+    	var checklength=checkids.length;
+    	for(var j=0;j<checklength;j++){
+    		$("input[name='xz'][value="+checkids[j]+"]").prop("checked",true);
+    }
+    }
+    function formatAction(value,row,index){
+  		return "<input type='checkbox' name='xz' value='"+row.id+"' resname='"+row.name+"'/>";
+    }
+	 /*]]>*/
+    </script>
+</body>
+</html>