Compare commits

..

No commits in common. "f78746f7d291a544b7f57e45cb0771893ce5eb6e" and "b5874c78a77a7f4d766b4a4d03651280d0b15308" have entirely different histories.

1 changed files with 1 additions and 8 deletions

View File

@ -63,16 +63,10 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
* *
*/ */
public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) { public PageResult<SearchBizProjectResult> paging(PageParam pageParam, BizProjectEntity bizProjectEntity) {
AuditStatus auditStatus = bizProjectEntity.getAuditStatus();
String aStatus = "";
if (null != auditStatus) {
aStatus = auditStatus.getVal();
}
UserDetail userDetail = SecurityUtil.loginUser(); UserDetail userDetail = SecurityUtil.loginUser();
BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values()); BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values());
QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query() QueryWrapper<BizProjectEntity> ew = Wrappers.<BizProjectEntity>query()
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName()) .like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName());
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus);
if (bizObj != null && bizObj.isTrans()) { if (bizObj != null && bizObj.isTrans()) {
ew.eq("a.user_id", userDetail.getUserId()); ew.eq("a.user_id", userDetail.getUserId());
@ -81,7 +75,6 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
} }
return PageResult.of(baseMapper.paging(pageParam.toPage(), ew)); return PageResult.of(baseMapper.paging(pageParam.toPage(), ew));
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)