git-svn-id: https://192.168.57.71/svn/hbghj@85 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/BaseController.java

@@ -636,7 +636,7 @@ public abstract class BaseController {
 									.getCurrentUser().getSzd().getByzd2()
 									+ "%"));
 				// 根据站所过滤
-				/*if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
+				if(Utils.getCurrentUser().getZs() != null && StringUtils.isNotEmpty(jyr) ){
 					if(jyr.equals("id")){
 						filterList.add(cb.equal(root.get("zs").get("id").as(Long.class),
 								Utils.getCurrentUser().getZs().getId()));
@@ -645,7 +645,7 @@ public abstract class BaseController {
 								Utils.getCurrentUser().getZs().getId()));
 					}
 					
-				}*/
+				}
 				if (role != null)
 					role = Utils.getParentRole(role);
 				orList.add(cb.like(root.get("recordCode").as(String.class),