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

gkjsjy/trunk/src/com/xt/jygl/common/SearchCondition.java

@@ -313,4 +313,7 @@ public class SearchCondition {
 
 	// 通知公告
 	public static int ggpage = 1;
+	
+	// 角色管理
+	public static int rolepage = 1;
 }

gkjsjy/trunk/src/com/xt/jygl/set/role/ctl/RoleCtl.java

@@ -2,11 +2,13 @@ package com.xt.jygl.set.role.ctl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.servlet.http.HttpServletRequest;
 
 import net.sf.json.JSONObject;
 
@@ -18,9 +20,12 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import cache.CacheSearchCondition;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.common.SearchCondition;
 import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.base.vo.TreeNode;
@@ -45,7 +50,8 @@ public class RoleCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("role:main")
-	public String main(SimplePageRequest page, Model model, final String rolename, final String menuid) throws JsonProcessingException {
+	public String main(final HttpServletRequest request,SimplePageRequest page, Model model, final String rolename, final String menuid) throws JsonProcessingException {
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "gkjyxksq");
 		// 查詢條件
 		Specification<RoleEntity> spec = new Specification<RoleEntity>() {
 
@@ -54,12 +60,20 @@ public class RoleCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(rolename)) {
 					list.add(cb.like(root.get("name").as(String.class), "%" + rolename + "%"));
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rolename");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("name").as(String.class), "%" + v + "%"));
+					}
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
+		if (page.getPage() < 1) {
+			page.setPage(SearchCondition.rolepage);
+		}
 		page.setSort("sortno");
 		page.setOrder("asc");
 		Page<RoleEntity> list = query.findAll(spec, toPageRequest(page), RoleEntity.class);
@@ -67,8 +81,13 @@ public class RoleCtl extends BaseWebCtl {
 		for (RoleEntity roleEntity : list) {
 			roleList.add(roleEntity);
 		}
+		if (isPOST(request)) {
+			SearchCondition.rolepage = page.getPage();
+			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
+		}
+
 		model.addAttribute("list", roleList);
-		model.addAttribute("rolename", rolename);
+		model.addAttribute("rolename", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rolename"));
 		model.addAttribute("menuid", menuid);
 		// 翻页共通
 		putPageInfo(model, page, list);

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -96,7 +96,10 @@ public class UserCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(username)) {
 					list.add(cb.like(root.get("name").as(String.class), "%" + username + "%"));
 				} else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "name");
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "username");
+					if (StringUtils.isNotEmpty(v)) {
+						list.add(cb.like(root.get("name").as(String.class), "%" + v + "%"));
+					}
 				}
 				if (StringUtils.isNotEmpty(uname)) {
 					list.add(cb.like(root.get("uname").as(String.class), "%" + uname + "%"));