Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

# Conflicts:
#	njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java

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

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

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

@@ -165,6 +165,7 @@ 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)

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

@@ -1,10 +1,12 @@
 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;
@@ -24,6 +26,7 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
      * 新增
      */
     public void add(MoneyAccountEntity moneyAccountEntity) {
+        moneyAccountEntity.setUserId(SecurityUtil.currentUserId());
         this.save(moneyAccountEntity);
     }
 
@@ -53,7 +56,9 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
      * 分页查询
      */
     public PageResult<MoneyAccountEntity> paging(PageParam pageParam, MoneyAccountEntity moneyAccountEntity) {
-        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<MoneyAccountEntity>query(moneyAccountEntity)));
+        Long stationId = moneyAccountEntity.getStationId();
+        return PageResult.of(this.page(pageParam.toPage(), Wrappers.<MoneyAccountEntity>lambdaQuery()
+        .eq(null != stationId, MoneyAccountEntity::getStationId, stationId)));
     }
 
 }