Compare commits
No commits in common. "269bf7ae48150a712a3ca7bf3e20db7457ebbd53" and "528e69f67c64a53a09def32dca0cd6ddc4471f78" have entirely different histories.
269bf7ae48
...
528e69f67c
|
|
@ -171,24 +171,17 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
|
||||||
|
|
||||||
String uscc = searchCompanyParam.getUscc();
|
String uscc = searchCompanyParam.getUscc();
|
||||||
AuditStatus auditStatus = searchCompanyParam.getAuditStatus();
|
AuditStatus auditStatus = searchCompanyParam.getAuditStatus();
|
||||||
String aStatus = "";
|
|
||||||
if (null != auditStatus) {
|
|
||||||
aStatus = auditStatus.getVal();
|
|
||||||
}
|
|
||||||
String companyName = searchCompanyParam.getCompanyName();
|
String companyName = searchCompanyParam.getCompanyName();
|
||||||
String legalRepresentative = searchCompanyParam.getLegalRepresentative();
|
String legalRepresentative = searchCompanyParam.getLegalRepresentative();
|
||||||
Integer station = searchCompanyParam.getStation();
|
Integer station = searchCompanyParam.getStation();
|
||||||
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
|
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
|
||||||
// .eq("a.station", Boolean.FALSE)
|
|
||||||
.eq(StrUtil.isNotBlank(aStatus), "a.audit_status", aStatus)
|
|
||||||
.eq("a.station", station != null && station == 1)
|
.eq("a.station", station != null && station == 1)
|
||||||
// .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
|
.eq(auditStatus != null, "a.audit_status", auditStatus)
|
||||||
.in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
|
.in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
|
||||||
.like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
|
.like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
|
||||||
.like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
|
.like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)
|
||||||
.like(StrUtil.isNotBlank(uscc), "a.uscc", uscc)
|
.like(StrUtil.isNotBlank(uscc), "a.uscc", uscc)
|
||||||
));
|
));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue