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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zysqbp/ZysqbpController.java

@@ -2718,9 +2718,8 @@ public class ZysqbpController extends BaseController {
 	 * @param id
 	 * @return
 	 */
-	public BusinessContext queryCjhsList(ZysqbpEntity zysqbp,Pageable pageable,  Date ksq,
-			 Date ksz,  Date jsq,  Date jsz,  String zygk,
-			 String cm) {
+	public BusinessContext queryCjhsList(ZysqbpEntity zysqbp,Pageable pageable, 
+			Date ksq,Date ksz,  Date jsq,  Date jsz,  String zygk,String cm) {
 		BusinessContext bc = new BusinessContext();
 		List<PredicateModel> filterList = new ArrayList<PredicateModel>();
 		ksq = Utils.getDateFirstTime(ksq);
@@ -2734,10 +2733,8 @@ public class ZysqbpController extends BaseController {
 		addNotEmptyModel(filterList, "gkzwmc", zygk, Operator.LIKE);
 		addNotEmptyModel(filterList, "zwcm", cm, Operator.LIKE);
 		// 权限过滤
-		Specification<DtywCbsbEntity> spec = SpecificationCreater
-				.searchByPredicateModels(filterList);
-		SinglePageRequest page = new SinglePageRequest(pageable.getPageSize(),
-				pageable.getPageNumber(), "desc", "kszysj");
+		Specification<DtywCbsbEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
+		SinglePageRequest page = new SinglePageRequest(pageable.getPageNumber(),pageable.getPageSize(), "desc", "kszysj");
 		Page<DtywCbsbEntity> cbsbPageList = dtywCbsbService.findAll(spec, page);
 		List<CjhsEntity> cjhsList = new ArrayList<CjhsEntity>();
 		List<CjhsDbEntity> cjhsDbList = cjhsDbService.findByGksbbh(zysqbp