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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -121,7 +121,6 @@ import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.QueryService;
 import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.entity.UserEntity;
-import com.xtframe.sec.utils.SecUtils;
 import com.xtframe.util.DateTime;
 import com.xtframe.util.StringUtils;
 
@@ -279,12 +278,13 @@ public class XkzxxCtl extends BaseWebCtl {
 					}
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.equal(root.get("sfyx").as(String.class), v));
-					} else {
-//						if (StringUtils.isEmpty(sfyx)) {
-//							//list.add(cb.equal(root.get("sfyx").as(String.class), "1"));
-//						}
+					if ("1".equals(v)){
+						list.add(cb.greaterThan(root.get("yxqz").as(Date.class), now));
+						list.add(cb.equal(root.get("sfyx").as(String.class), BaseEntity.RECORD_STATE_VALID));
+					} else if ("2".equals(v)){
+						Predicate p1 =cb.lessThan(root.get("yxqz").as(Date.class), now);
+						Predicate p2 = cb.notEqual(root.get("sfyx").as(String.class), BaseEntity.RECORD_STATE_VALID); 
+						list.add(cb.and(cb.or(p1,p2)));
 					}
 				}
 				if (yxq1 != null) {
@@ -360,7 +360,7 @@ public class XkzxxCtl extends BaseWebCtl {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		String user1 = (String) Utils.getSession().getAttribute("user");
+		/*String user1 = (String) Utils.getSession().getAttribute("user");
 		String user2 = SecUtils.getCurrUser().getId();
 		if (user2 != null) {
 			if (!user2.equals(user1)) {
@@ -377,7 +377,7 @@ public class XkzxxCtl extends BaseWebCtl {
 			}
 
 		}
-		Utils.getSession().setAttribute("user", user2);
+		Utils.getSession().setAttribute("user", user2);*/
 
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.xkzpage);