Merge branch 'master' into dev

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerServiceImpl.java

@@ -4,13 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.area.utils.CustomizeAreaUtil;
-import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.coding.bo.CustomerCodeAndCountryId;
 import com.fjhx.common.service.coding.CodingRuleCustomerService;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
@@ -315,10 +313,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
     @Override
     public List<Long> getAuthIdList() {
         List<Long> authUserIdList = UserUtil.getAuthUserIdList();
-        DynamicDataSourceContextHolder.push(SourceConstant.CUSTOMER);
-        List<Long> customer = listObject(Customer::getId, q -> q.in(Customer::getUserId, authUserIdList));
-        DynamicDataSourceContextHolder.poll();
-        return customer;
+        return listObject(Customer::getId, q -> q.in(Customer::getUserId, authUserIdList));
     }
 
     // 根据字典编码获取字典的数据

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -140,6 +140,12 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Override
     public Page<ContractVo> getPage(ContractSelectDto dto) {
 
+        List<Long> authIdList = customerService.getAuthIdList();
+
+        if (authIdList.size() == 0) {
+            return new Page<>();
+        }
+
         IWrapper<Contract> wrapper = getWrapper();
         wrapper.orderByDesc("t1", Contract::getCreateTime);
         wrapper.between("t1", Contract::getStatus, FlowStatusEnum.DRAFT.getKey(), FlowStatusEnum.CANCELLATION.getKey() - 1);
@@ -156,7 +162,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }
 
-        wrapper.in("t1", Contract::getBuyCorporationId, customerService.getAuthIdList());
+        wrapper.in("t1", Contract::getBuyCorporationId, authIdList);
 
         Page<ContractVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ContractVo> list = page.getRecords();