liuc/biz_supplier_manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat-examination' into 'uat'

Browse Source 
增加查询条件

See merge request eshop/biz_service_ebtp_project!55
This commit is contained in:
付庆吉
2022-05-20 10:07:13 +08:00
parent 1f6228fb63 f63b7f901c
commit 5a6ec1a3db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/BizProjectNotificationServiceImpl.java
View File

@ -116,7 +116,7 @@ public class BizProjectNotificationServiceImpl extends BaseServiceImpl<BizProjec
.ne("a.status", "d") .ne("a.status", "d")
.like(StringUtils.isNotBlank(projectRecord.getProjectName()), "b.project_name", projectRecord.getProjectName()) .like(StringUtils.isNotBlank(projectRecord.getProjectName()), "b.project_name", projectRecord.getProjectName())
.eq(StringUtils.isNotBlank(projectRecord.getBidMethodDict()), "b.bid_method_dict", projectRecord.getBidMethodDict()) .eq(StringUtils.isNotBlank(projectRecord.getBidMethodDict()), "b.bid_method_dict", projectRecord.getBidMethodDict())
.eq(Objects.isNull(projectRecord.getBusinessModule()), "b.business_module", projectRecord.getBusinessModule()) .eq(!Objects.isNull(projectRecord.getBusinessModule()), "b.business_module", projectRecord.getBusinessModule())
.eq(StringUtils.isNotBlank(projectRecord.getIsPublic()), "b.is_public", projectRecord.getIsPublic()) .eq(StringUtils.isNotBlank(projectRecord.getIsPublic()), "b.is_public", projectRecord.getIsPublic())
.orderByDesc("a.create_date"); .orderByDesc("a.create_date");
IPage<ProjectRecordVO> page = projectNotificationMapper.getPageBySupervisor( IPage<ProjectRecordVO> page = projectNotificationMapper.getPageBySupervisor(

2
src/main/java/com/chinaunicom/mall/ebtp/project/projectrecord/service/impl/ProjectRecordServiceImpl.java
View File

@ -195,7 +195,7 @@ public class ProjectRecordServiceImpl extends BaseServiceImpl<ProjectRecordMappe
query.eq("is_public", projectRecordVO.getIsPublic()); query.eq("is_public", projectRecordVO.getIsPublic());
} }
if(Objects.isNull(projectRecordVO.getBusinessModule())){ if(!Objects.isNull(projectRecordVO.getBusinessModule())){
query.eq("business_module", projectRecordVO.getBusinessModule()); query.eq("business_module", projectRecordVO.getBusinessModule());
} }