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

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

@@ -198,20 +198,20 @@ public class XkzxxCtl extends BaseWebCtl {
 				// SearchCondition.xkzgkjyxkzh + "%"));
 				// }
 				if (StringUtils.isNotEmpty(sfyx)) {
-					if ("1".equals(sfyx)) {
+					//if ("1".equals(sfyx)) {
 						list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
-					} else {
-						list.add(cb.notEqual(root.get("sfyx").as(String.class), sfyx));
-					}
+					//} else {
+					//	list.add(cb.notEqual(root.get("sfyx").as(String.class), "2"));
+					//}
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");
 
 					if (StringUtils.isNotEmpty(v)) {
-						if ("1".equals(sfyx)) {
+						//if ("1".equals(sfyx)) {
 							list.add(cb.equal(root.get("sfyx").as(String.class), v));
-						} else {
-							list.add(cb.notEqual(root.get("sfyx").as(String.class), v));
-						}
+						//} else {
+						//	list.add(cb.notEqual(root.get("sfyx").as(String.class), v));
+						//}
 					}
 				}
 				// else if (StringUtils.isNotEmpty(SearchCondition.sfyx) &&