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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

@@ -86,7 +86,7 @@ public class JgbgCtl extends BaseWebCtl {
 	@RequestMapping(value = "/main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jgbg");
 
 		Specification<JgbgEntity> spec = new Specification<JgbgEntity>() {
 			// 查询条件

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -120,7 +120,7 @@ public class JgsqCtl extends BaseWebCtl {
 	@RequiresPermissions("jgsq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jgsq");
 
 		Specification<JgsqEntity> spec = new Specification<JgsqEntity>() {
 			// 查询条件
@@ -197,7 +197,6 @@ public class JgsqCtl extends BaseWebCtl {
 		};
 
 		if (page.getPage() < 1) {
-
 			page.setPage(SearchCondition.jgsqpage);
 		}
 
@@ -282,6 +281,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 		if (isPOST(request)) {
 			SearchCondition.jgsqpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
 		model.addAttribute("list", voList);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -122,7 +122,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 	@RequiresPermissions("jgsqds:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jgsqds");
 
 		Specification<JgsqEntity> spec = new Specification<JgsqEntity>() {
 			// 查询条件
@@ -199,7 +199,6 @@ public class JgsqdsCtl extends BaseWebCtl {
 		};
 
 		if (page.getPage() < 1) {
-			
 			page.setPage(SearchCondition.jgsqdspage);
 		}
 
@@ -276,6 +275,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 		if (isPOST(request)) {
 			SearchCondition.jgsqdspage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
 		model.addAttribute("list", voList);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -88,7 +88,7 @@ public class JgzxCtl extends BaseWebCtl {
 	@RequiresPermissions("jgzx:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jgzx");
 
 		Specification<JgzxEntity> spec = new Specification<JgzxEntity>() {
 			// 查询条件

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -122,7 +122,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 	@RequiresPermissions("jsjdbg:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jsjdbg");
 
 		Specification<JsjdbgEntity> spec = new Specification<JsjdbgEntity>() {
 			// 查询条件
@@ -285,6 +285,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		if (isPOST(request)) {
 			SearchCondition.jsjdbgpage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
 		model.addAttribute("list", voList);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -121,7 +121,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	@RequiresPermissions("jsjdbgds:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jsjdbgds");
 
 		Specification<JsjdbgEntity> spec = new Specification<JsjdbgEntity>() {
 			// 查询条件
@@ -268,6 +268,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 		if (isPOST(request)) {
 			SearchCondition.jsjdbgdspage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
 		model.addAttribute("list", voList);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl2.java

@@ -93,7 +93,7 @@ public class JsjdglCtl2 extends BaseWebCtl {
 	@RequestMapping(value = "/main")
 	//@RequiresPermissions("jsjdgl2:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szdid, final String szgkid, final String szgqid, String menuid, final String dqzt, final String xmfr, final String lcjd) throws JsonProcessingException {
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"jsjdgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"jsjdgl2");
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

@@ -87,7 +87,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 	@RequiresPermissions("jsjdzx:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jsjdzx");
 
 		Specification<JsjdzxEntity> spec = new Specification<JsjdzxEntity>() {
 			// 查询条件