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

gkjsjy/trunk/src/com/cxfws/gkggxxfw/service/impl/JzxhxhbglService.java

@@ -109,6 +109,7 @@ public class JzxhxhbglService extends BaseWebCtl implements IJzxhxhbglService {
 							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 						}
 						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[] {}));
 					}
 				};

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/AxxxService.java

@@ -78,6 +78,7 @@ public class AxxxService extends BaseWebCtl  implements IAxxxService{
 				} 
 				
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/GkxxService.java

@@ -64,6 +64,7 @@ public class GkxxService  extends BaseWebCtl implements IGkxxService{
 							list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + ssgkglbm + "%"));
 						} 
 						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[] {}));
 					}
 				};

gkjsjy/trunk/src/com/cxfws/gkjcxx/service/impl/JghdxxService.java

@@ -66,6 +66,7 @@ public class JghdxxService extends BaseWebCtl  implements IJghdxxService{
 				}
 				
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/cxfws/sjtjfx/service/impl/ZysbybWebService.java

@@ -107,6 +107,7 @@ public class ZysbybWebService extends BaseWebCtl implements IZysbybWebService {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/JsjdglWebService.java

@@ -202,6 +202,7 @@ public class JsjdglWebService extends BaseWebCtl implements IJsjdglWebService {
 				// 只显示状态为8或者3的
 				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.RECORD_STATE_VALID));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/TzjhglWebService.java

@@ -152,6 +152,7 @@ public class TzjhglWebService extends BaseWebCtl implements ITzjhglWebService {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/cxfws/xmxxgl/service/impl/XmxxglWebService.java

@@ -144,6 +144,7 @@ public class XmxxglWebService extends BaseWebCtl implements IXmxxglWebService {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/ctl/HxglCtl.java

@@ -92,6 +92,7 @@ public class HxglCtl extends BaseWebCtl {
 					}
 				}
 				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));
 				query.where(cb.and(list.toArray(new Predicate[] {})));
 				query.orderBy(cb.desc(root.get("jyrid").get("id").as(String.class)), cb.desc(root.get("rq").as(String.class)));
 				return query.getRestriction();
@@ -216,6 +217,7 @@ public class HxglCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxhbgl/ctl/HxhbglCtl.java

@@ -144,6 +144,7 @@ public class HxhbglCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdjc/ctl/JdjcCtl.java

@@ -133,6 +133,7 @@ public class JdjcCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtx/ctl/JdtxCtl.java

@@ -94,6 +94,7 @@ public class JdtxCtl extends BaseWebCtl {
 				// SecUtils.getCurrUser().getId() + "%")));
 				list.add(cb.exists(subquery));
 				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[] {}));
 			}
 		};
@@ -287,6 +288,7 @@ public class JdtxCtl extends BaseWebCtl {
 			public Predicate toPredicate(Root<XzglryEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				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));
 				list.add(cb.equal(root.get("szd").get("val").as(String.class), GlobalData.CITY_CODE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java

@@ -150,6 +150,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/gg/ctl/GgCtl.java

@@ -95,6 +95,7 @@ public class GgCtl extends BaseWebCtl {
 				}
 			
 				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[] {}));
 			}
 		};
@@ -358,6 +359,7 @@ public class GgCtl extends BaseWebCtl {
 			public Predicate toPredicate(Root<XzglryEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				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));
 				list.add(cb.equal(root.get("szd").get("val").as(String.class),GlobalData.CITY_CODE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggfb/ctl/GgfbCtl.java

@@ -55,6 +55,7 @@ public class GgfbCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("senduser").as(String.class), "%" + senduser + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java

@@ -152,6 +152,7 @@ public class GgxxCtl extends BaseWebCtl {
 				}
 
 				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));
 
 				if (!StringUtils.isEmpty(fbr)) {
 					// 子查询

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java

@@ -152,6 +152,7 @@ public class AxCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};
@@ -475,6 +476,7 @@ public class AxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};
@@ -556,6 +558,7 @@ public class AxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java

@@ -89,6 +89,7 @@ public class GkCtl extends BaseWebCtl {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");
 				}
 				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[] {}));
 			}
 		};

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

@@ -118,6 +118,7 @@ public class JghdCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/ctl/MtCtl.java

@@ -377,6 +377,7 @@ public class MtCtl extends BaseWebCtl {
 				list.add(cb.equal(root.get("szd").get("id").as(String.class), szd));
 				list.add(cb.equal(root.get("szgq").get("id").as(String.class), szgq));
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

@@ -157,6 +157,7 @@ public class JgbgCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -185,6 +185,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -193,6 +193,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};
@@ -1607,6 +1608,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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));
 				/*
 				 * list.add(cb.notEqual(root.get("recordStatus").as(Integer.class
 				 * ), BaseEntity.RECORD_STATE_VALID));

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -159,6 +159,7 @@ public class JgzxCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -193,6 +193,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -192,6 +192,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};
@@ -1432,6 +1433,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
 				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -185,6 +185,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -199,6 +199,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};
@@ -1564,6 +1565,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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));
 
 				Subquery<TaskInfoEntity> subquery = query.subquery(TaskInfoEntity.class);
 				Root<TaskInfoEntity> dpRoot = subquery.from(TaskInfoEntity.class);

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

@@ -155,6 +155,7 @@ public class JsjdglCtl2 extends BaseWebCtl {
 				}
 				//只显示状态为8或者3的
 				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));
 				//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
@@ -874,6 +875,7 @@ public class JsjdglCtl2 extends BaseWebCtl {
 					list.add(cb.like(root.get("createUser").as(String.class), "%" + securityMgr.getCurrUser().getId() + "%"));
 				}
 				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));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), 8));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

@@ -158,6 +158,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -205,6 +205,7 @@ public class XmxxglCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};
@@ -856,6 +857,7 @@ public class XmxxglCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -200,6 +200,7 @@ public class DcsbCtl extends BaseWebCtl {
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java

@@ -185,6 +185,7 @@ public class DcsbybbCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbServiceImpl.java

@@ -123,6 +123,8 @@ public class DcsbServiceImpl extends BaseWorkFlowServiceImpl<DcsbEntity, String>
 			if (securityMgr.getCurrUser() != null) {
 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 					gqid = entity.getSzgq().getId();
+				}else{
+					gqid = entity.getSzgq().getId();
 				}
 			} else {
 				gqid = entity.getSzgq().getId();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java

@@ -615,7 +615,7 @@ public class CkCtl extends BaseWebCtl {
 				list.add(cb.equal(root.get("szd").get("id").as(String.class), bwszd));
 				list.add(cb.equal(root.get("szgq").get("id").as(String.class), bwszgq));
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -1404,6 +1404,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				list.add(cb.like(root.get("gkjyr").as(String.class), "%" + id + "%"));
 				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));
 				list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
@@ -1443,6 +1444,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + id + "%"));
 				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[] {}));
 			}
 		};
@@ -2145,6 +2147,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + id + "%"));
 				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[] {}));
 			}
 		};
@@ -2199,6 +2202,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				list.add(cb.like(root.get("gkjyr").as(String.class), "%" + id + "%"));
 				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));
 				list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -189,6 +189,7 @@ public class XkzfzCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};
@@ -507,6 +508,7 @@ public class XkzfzCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzns/ctl/XkznsCtl.java

@@ -106,6 +106,7 @@ public class XkznsCtl extends BaseWebCtl {
 
 				}
 				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));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (!isJyr()) {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/service/impl/XkzbgServiceImpl.java

@@ -102,7 +102,13 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			if(securityMgr.getCurrUser()!=null){
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					gqid = entity.getSzgq().getId();
+				}else{
+					gqid = entity.getSzgq().getId();
+				}
+			}else{
 				gqid = entity.getSzgq().getId();
 			}
 			Map<String, Object> variables = new HashMap<String, Object>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -267,6 +267,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				
 				}
 				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[] {}));
 			}
@@ -418,6 +419,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -454,6 +456,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -662,6 +665,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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));
 					list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
@@ -701,6 +705,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -879,6 +884,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -917,6 +923,7 @@ public class XkzsqCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -206,6 +206,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					}
 				}
 				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[] {}));
 			}
 		};
@@ -278,6 +279,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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));
 					list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
@@ -317,6 +319,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -765,6 +768,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -803,6 +807,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1035,6 +1040,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1073,6 +1079,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/service/impl/XkzyxServiceImpl.java

@@ -56,9 +56,16 @@ public class XkzyxServiceImpl extends BaseWorkFlowServiceImpl<XkzyxEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			if(securityMgr.getCurrUser()!=null){
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					gqid = entity.getSzgq().getId();
+				}else{
+					gqid = entity.getSzgq().getId();
+				}
+			}else{
 				gqid = entity.getSzgq().getId();
 			}
+			
 			Map<String, Object> variables = new HashMap<String, Object>();
 			variables.put("role_clsc", Constants.ROLE_CLSC + ":" + gqid);
 			variables.put("role_hc", Constants.ROLE_HC + ":" + gqid);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -235,6 +235,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
 				}
 				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));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (!isJyr()) {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
@@ -330,6 +331,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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));
 					list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
@@ -369,6 +371,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1027,6 +1030,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1065,6 +1069,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1232,6 +1237,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};
@@ -1270,6 +1276,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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[] {}));
 				}
 			};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/service/impl/XkzzxServiceImpl.java

@@ -102,7 +102,13 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			if(securityMgr.getCurrUser()!=null){
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					gqid = entity.getSzgq().getId();
+				}else{
+					gqid = entity.getSzgq().getId();
+				}
+			}else{
 				gqid = entity.getSzgq().getId();
 			}
 			Map<String, Object> variables = new HashMap<String, Object>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -149,6 +149,7 @@ public class LhbgCtl extends BaseWebCtl {
 				}
 
 				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));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -133,6 +133,7 @@ public class LhsqCtl extends BaseWebCtl {
 					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));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

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

@@ -144,6 +144,7 @@ public class LhyxCtl extends BaseWebCtl {
 					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));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkaxzyhmtsslyxlfx/ctl/GkaxzytjCtl.java

@@ -51,6 +51,7 @@ public class GkaxzytjCtl extends BaseWebCtl{
 			public Predicate toPredicate(Root<XmxxglEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/set/role/ctl/RoleCtl.java

@@ -56,6 +56,7 @@ public class RoleCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("name").as(String.class), "%" + rolename + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -113,6 +113,7 @@ public class UserCtl extends BaseWebCtl {
 				}
 
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/CommonCtl.java

@@ -294,6 +294,7 @@ public class CommonCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("zwcm").as(String.class), "%" + zwcm + "%"));
 				}
 				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[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/IndexCtl.java

@@ -210,6 +210,7 @@ public class IndexCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(gqid)) {
 					list.add(cb.equal(root.get("szgq").get("id").as(String.class), gqid));
 				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				Calendar startCal = Calendar.getInstance();
 				startCal.set(Calendar.HOUR_OF_DAY, 0);

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -409,6 +409,7 @@ public class MainCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				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.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
@@ -1101,6 +1102,7 @@ public class MainCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				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.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));