|  | @@ -32,11 +32,19 @@ public class C00001Service extends C00001BaseModel implements ExecProcessFlow {
 | 
											
												
													
														|  |  		String searchtag =this.getA_c00001().getSearchtag();
 |  |  		String searchtag =this.getA_c00001().getSearchtag();
 | 
											
												
													
														|  |  		AdiProjectMapper projectDao  = UtilTools.getBean(AdiProjectMapper.class);
 |  |  		AdiProjectMapper projectDao  = UtilTools.getBean(AdiProjectMapper.class);
 | 
											
												
													
														|  |  		AdiProjectSQLBuilder sb =new AdiProjectSQLBuilder();
 |  |  		AdiProjectSQLBuilder sb =new AdiProjectSQLBuilder();
 | 
											
												
													
														|  | -		AdiProjectSQLBuilder.Criteria sc =sb.createCriteria();
 |  | 
 | 
											
												
													
														|  | -		sc.andUidEqualTo(userId);
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  		if(!StringUtil.isEmpty(searchtag)){
 |  |  		if(!StringUtil.isEmpty(searchtag)){
 | 
											
												
													
														|  | -			sb.or(sb.createCriteria().andNameLike("%"+searchtag+"%"));
 |  | 
 | 
											
												
													
														|  | -			sb.or(sb.createCriteria().andRemarkLike("%"+searchtag+"%"));
 |  | 
 | 
											
												
													
														|  | 
 |  | +			AdiProjectSQLBuilder.Criteria sc1 =sb.createCriteria();
 | 
											
												
													
														|  | 
 |  | +			sc1.andUidEqualTo(userId);
 | 
											
												
													
														|  | 
 |  | +			sc1.andNameLike("%"+searchtag+"%");
 | 
											
												
													
														|  | 
 |  | +			AdiProjectSQLBuilder.Criteria sc2 =sb.createCriteria();
 | 
											
												
													
														|  | 
 |  | +			sc2.andUidEqualTo(userId);
 | 
											
												
													
														|  | 
 |  | +			sc2.andRemarkLike("%"+searchtag+"%");
 | 
											
												
													
														|  | 
 |  | +			sb.or(sc1);
 | 
											
												
													
														|  | 
 |  | +			sb.or(sc2);
 | 
											
												
													
														|  | 
 |  | +		}else{
 | 
											
												
													
														|  | 
 |  | +			AdiProjectSQLBuilder.Criteria sc =sb.createCriteria();
 | 
											
												
													
														|  | 
 |  | +			sc.andUidEqualTo(userId);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  		Long count = projectDao.countByExample(sb);
 |  |  		Long count = projectDao.countByExample(sb);
 | 
											
												
													
														|  |  
 |  |  
 |