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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -18,7 +18,6 @@ import javax.persistence.criteria.Root;
 import javax.persistence.criteria.Subquery;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.poi.hssf.util.HSSFColor.GOLD;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -186,40 +185,50 @@ public class JsjdglCtl extends BaseWebCtl {
 					} else {
 						subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));
 						// 初始化查询条件，企业默认空，管理部门默认岸线审批之后
+						boolean flag = false;
 						if ("initJsjdgl".equals(dqzt)) {
 							if (!isJyr()) {
+								flag = true;
 								subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
 							}
-						} else {
-							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + dqzt + "%"));
 						}
 
 						if ("岸线利用审批".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "岸线利用审批支撑文件审查" + "%"));
 						}
 						if ("项目审批、核准、备案".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "项目审批、核准、备案支撑文件审查" + "%"));
 						}
 						if ("初步设计审批".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "初步设计审批支撑文件审查" + "%"));
 						}
 						if ("施工图设计审批".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "施工图设计审批支撑文件审查" + "%"));
 						}
 						if ("开工备案".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "开工备案支撑文件审查" + "%"));
 						}
 						if ("交工验收".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "交工验收" + "%"));
 						}
 						if ("试运行备案".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "试运行备案" + "%"));
 						}
 						if ("竣工验收".equals(dqzt)) {
+							flag = true;
 							subQueryPredicates.add(cb.like(dpRoot.get("currName").as(String.class), "%" + "竣工验收" + "%"));
 						}
-						subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
-						list.add(cb.exists(subquery));
+						if (flag) {
+							subquery.where(subQueryPredicates.toArray(new Predicate[] {}));
+							list.add(cb.exists(subquery));
+						}
 					}
 				} else if (isGET(request) && StringUtils.isNotEmpty(dqzt)) {
 					subQueryPredicates.add(cb.equal(root.get("id").as(String.class), dpRoot.get("busId").as(String.class)));