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

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java

@@ -104,10 +104,10 @@ public class JghdCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(hdlx)) {
 					list.add(cb.like(root.get("hdlx").as(String.class), "%" + hdlx + "%"));
 				}
-				if (isJyr()) {
+				/*if (isJyr()) {
 					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
-					In<String> in = cb.in(root.get("szgq").as(String.class));
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					@SuppressWarnings("unchecked")
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
@@ -116,7 +116,17 @@ public class JghdCtl extends BaseWebCtl {
 						}
 						list.add(in);
 					}
-				}
+					
+					In<String> in = cb.in(root.get("szgq").as(String.class));
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+
+				}*/
 				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[] {}));