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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -114,9 +114,12 @@ public class LhyxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 				}
 				if (StringUtils.isNotEmpty(bgdd)) {
-					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
+					list.add(cb.like(root.get("zcdz").as(String.class), "%" + bgdd + "%"));
+				}
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
+				if(isJyr()){
+					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
 				}
-
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 
 				return cb.and(list.toArray(new Predicate[] {}));