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

Compare commits

base: lzq:ed7d647e9157a0dd2ed7cee85406ec3b994c571a
Branches Tags
lzq:dev
lzq:master
lzq:localizer
..
compare: lzq:9de1167f0571102909a29ef1f3538866d1c1e051
Branches Tags
lzq:dev
lzq:master
lzq:localizer

No commits in common. "ed7d647e9157a0dd2ed7cee85406ec3b994c571a" and "9de1167f0571102909a29ef1f3538866d1c1e051" have entirely different histories.
ed7d647e91 ... 9de1167f05

3 changed files with 1 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/param/SearchCompanyParam.java
View File

@ -17,8 +17,6 @@ public class SearchCompanyParam {
*/
private BizObj bizObj;
private String station;
/**
* 企业名称
*/

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

@ -165,7 +165,6 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
String legalRepresentative = searchCompanyParam.getLegalRepresentative();
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.query()
.eq(auditStatus != null, "a.audit_status", auditStatus)
.eq(StrUtil.isNotBlank(searchCompanyParam.getStation()), "a.station", searchCompanyParam.getStation())
.in(CollUtil.isNotEmpty(bizObjList), "b.biz_obj", bizObjList)
.like(StrUtil.isNotBlank(companyName), "a.company_name", companyName)
.like(StrUtil.isNotBlank(legalRepresentative), "a.legal_representative", legalRepresentative)

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/money/service/MoneyAccountService.java
View File

@ -1,12 +1,10 @@
package com.njzscloud.supervisory.money.service;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.money.mapper.MoneyAccountMapper;
import com.njzscloud.supervisory.money.pojo.entity.MoneyAccountEntity;
import lombok.extern.slf4j.Slf4j;
@ -26,7 +24,6 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
* 新增
*/
public void add(MoneyAccountEntity moneyAccountEntity) {
moneyAccountEntity.setUserId(SecurityUtil.currentUserId());
this.save(moneyAccountEntity);
}
@ -56,9 +53,7 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
* 分页查询
*/
public PageResult<MoneyAccountEntity> paging(PageParam pageParam, MoneyAccountEntity moneyAccountEntity) {
Long stationId = moneyAccountEntity.getStationId();
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<MoneyAccountEntity>lambdaQuery()
.eq(null != stationId, MoneyAccountEntity::getStationId, stationId)));
return PageResult.of(this.page(pageParam.toPage(), Wrappers.<MoneyAccountEntity>query(moneyAccountEntity)));
}
}