git-svn-id: https://192.168.57.71/svn/jsgkj@1543 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -146,7 +146,10 @@ public class XmxxglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(jyrmc)) {
 					list.add(cb.like(root.get("jyrid").get("gkjyr").as(String.class), "%" + jyrmc + "%"));
 				}else if(isGET(request)){
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "jyrmc");
+					String jyrmc = (String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrmc");
+					if ( StringUtils.isNotEmpty(jyrmc)){
+						list.add(cb.like(root.get("jyrid").get("gkjyr").as(String.class), "%" + jyrmc + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(xmhzjbid)) {
 					list.add(cb.like(root.get("xmhzjb").get("id").as(String.class), "%" + xmhzjbid + "%"));
@@ -289,18 +292,19 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		if (isPOST(request)) {
 			SearchCondition.xmxxpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
 		model.addAttribute("list", voList);
-		model.addAttribute("xmmc", xmmc);
-		model.addAttribute("xmbm", xmbm);
-		model.addAttribute("jyrmc", jyrmc);
-		model.addAttribute("szd", szdid);
-		model.addAttribute("szgk", szgkid);
-		model.addAttribute("szgq", szgqid);
-		model.addAttribute("xmhzjbid", xmhzjbid);
+		model.addAttribute("xmmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmmc"));
+		model.addAttribute("xmbm", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmbm"));
+		model.addAttribute("jyrmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrmc"));
+		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
+		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
+		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
+		model.addAttribute("xmhzjbid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmhzjbid"));
 		model.addAttribute("menuid", menuid);
-		model.addAttribute("sfyzjbzid", sfyzjbzid);
+		model.addAttribute("sfyzjbzid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));
 		// 翻页共通
 		putPageInfo(model, page, list);
 		return "gkjsgl/xmxxgl/xmxxglmain";