lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lzq:528e69f67c64a53a09def32dca0cd6ddc4471f78
Branches Tags
lzq:dev
lzq:master
lzq:localizer
..
compare: lzq:269bf7ae48150a712a3ca7bf3e20db7457ebbd53
Branches Tags
lzq:dev
lzq:master
lzq:localizer

2 Commits
528e69f67c ... 269bf7ae48

Author SHA1 Message Date
ljw 269bf7ae48 Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud 
# Conflicts:
#	njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
 2025-09-19 00:49:16 +08:00
ljw 0b85e7b0c0 公司审核 2025-09-19 00:32:17 +08:00
1 changed files with 8 additions and 1 deletions
Show Stats Expand all files Collapse all files

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
View File

@ -171,17 +171,24 @@ 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(auditStatus != null, "a.audit_status", auditStatus) // .eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
.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)