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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -496,6 +496,7 @@ public class XkzfzCtl extends BaseWebCtl {
 						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 					} else {
 						list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class), DateTime.addDays(now, 30)));
+						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 					}
 
 				}