修改bug

liujie

2025-10-29 3eda5364adada942f76a9f8a5f57881406f44286

修改bug

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java

@@ -99,6 +99,11 @@
        TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                .eq(TCrmSupplier::getUserId, userId)
                .last("LIMIT 1"));
        // ***
        if(Objects.isNull(crmSupplier)){
            SysUser sysUser = sysUserService.selectUserById(userId);
            crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
        }

        Map<String, Object> map = new HashMap<>();

@@ -141,6 +146,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            supplierAndClinicId = crmSupplier.getId();
        } else {
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
@@ -264,6 +274,11 @@
        TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                .eq(TCrmSupplier::getUserId, userId)
                .last("LIMIT 1"));
        // ***
        if(Objects.isNull(crmSupplier)){
            SysUser sysUser = sysUserService.selectUserById(userId);
            crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
        }
        // 查询药品总类和总数
        Integer typeTotalCount = erpProcurementService.supplierSalesStatisticsTypeCount(crmSupplier.getId());
        Integer totalCount = erpProcurementService.supplierSalesStatisticsCount(crmSupplier.getId());
@@ -309,6 +324,11 @@
        TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                .eq(TCrmSupplier::getUserId, userId)
                .last("LIMIT 1"));
        // ***
        if(Objects.isNull(crmSupplier)){
            SysUser sysUser = sysUserService.selectUserById(userId);
            crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
        }
        SupplierSalesStatisticsVO supplierSalesStatisticsVO = new SupplierSalesStatisticsVO();
        // 销售金额
        BigDecimal totalMoney = erpProcurementService.supplierSalesStatisticsMoney(crmSupplier.getId(), startTime, endTime);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/FinancialStatementsController.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -84,12 +85,22 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierId(crmSupplier.getId());
        }
        if (Objects.equals(roleType, 5)) {
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setClinicId(crmClinic.getId());
        }

@@ -108,12 +119,22 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierId(crmSupplier.getId());
        }
        if (Objects.equals(roleType, 5)) {
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setClinicId(crmClinic.getId());
        }
        List<ProcurementReportClinicExport> procurementReportClinicExports = erpProcurementService.exportProcurementReportClinic(query);
@@ -153,12 +174,22 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierId(crmSupplier.getId());
        }
        if (Objects.equals(roleType, 5)) {
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setClinicId(crmClinic.getId());
        }
        List<ProcurementReportSupplierExport> procurementReportSupplierExports = erpProcurementService.exportProcurementReportSupplier(query);
@@ -198,12 +229,22 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierId(crmSupplier.getId());
        }
        if (Objects.equals(roleType, 5)) {
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setClinicId(crmClinic.getId());
        }
        List<ProcurementReportPlatformExport> procurementReportPlatformExports = erpProcurementService.exportProcurementReportPlatform(query);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmWarehouseController.java

@@ -27,6 +27,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -88,6 +89,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            TCrmWarehouse crmWarehouse = crmWarehouseService.getById(crmSupplier.getWarehouseId());
            return R.ok(crmWarehouse);
        }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpClinicWarehousingController.java

@@ -25,6 +25,7 @@
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -47,12 +48,13 @@
    private final TCrmSupplierService crmSupplierService;
    private final TErpClinicWarehousingBatchService erpClinicWarehousingBatchService;
    private final TErpGoodsUnitService erpGoodsUnitService;
    private final ISysUserService sysUserService;


    @Autowired
    public TErpClinicWarehousingController(TErpClinicWarehousingService erpClinicWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService,
                                             TCrmClinicService crmClinicService,TCrmSupplierService crmSupplierService,TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
                                           TErpGoodsUnitService erpGoodsUnitService) {
                                           TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
                                           TErpGoodsUnitService erpGoodsUnitService, ISysUserService sysUserService) {
        this.erpClinicWarehousingService = erpClinicWarehousingService;
        this.erpGoodsService = erpGoodsService;
        this.tokenService = tokenService;
@@ -61,6 +63,7 @@
        this.erpClinicWarehousingBatchService = erpClinicWarehousingBatchService;
        this.erpGoodsUnitService = erpGoodsUnitService;

        this.sysUserService = sysUserService;
    }


@@ -80,6 +83,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -87,6 +95,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmClinic.getId());
        }

@@ -107,6 +120,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -114,6 +132,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmClinic.getId());
        }

@@ -204,6 +227,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -223,6 +251,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -242,6 +275,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -260,6 +298,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -277,6 +320,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }
        erpClinicWarehousingService.warehouseGoods(dto,user,supplierClinicId);
@@ -294,6 +342,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
            List<TErpClinicWarehousing> list = erpClinicWarehousingService.list(new LambdaQueryWrapper<TErpClinicWarehousing>().eq(TErpClinicWarehousing::getClinicId, supplierClinicId).eq(TErpClinicWarehousing::getStatus, 1).orderByDesc(BaseModel::getCreateTime));
            if(list.isEmpty()){
@@ -329,6 +382,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -347,6 +405,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }
        erpClinicWarehousingService.outboundGoods(dto,user,supplierClinicId);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java

@@ -45,10 +45,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -75,11 +72,12 @@
    private final TErpMaintenanceReminderService erpMaintenanceReminderService;
    private final TCrmClinicService crmClinicService;
    private final TCrmSupplierService crmSupplierService;
    private final ISysUserService sysUserService;

    @Autowired
    public TErpGoodsController(TErpGoodsService erpGoodsService, TokenService tokenService, TErpGoodsTypeService erpGoodsTypeService, TErpGoodsUnitService erpGoodsUnitService,
                               TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService, TErpSupplierWarehousingService erpSupplierWarehousingService,
                               TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService) {
                               TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
        this.erpGoodsService = erpGoodsService;
        this.tokenService = tokenService;
        this.erpGoodsTypeService = erpGoodsTypeService;
@@ -90,6 +88,7 @@
        this.erpMaintenanceReminderService = erpMaintenanceReminderService;
        this.crmClinicService = crmClinicService;
        this.crmSupplierService = crmSupplierService;
        this.sysUserService = sysUserService;
    }


@@ -107,6 +106,12 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }

            query.setSupplierClinicId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -114,6 +119,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmClinic.getId());
        }
        return R.ok(erpGoodsService.pageList(query,user));
@@ -150,6 +160,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }
        Page<TErpGoods> tErpGoodsPage = new Page<>(query.getPageNum(), query.getPageSize());
@@ -173,6 +188,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }

@@ -214,6 +234,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            goods.setSupplierClinicId(crmSupplier.getId());
            goods.setGoodsSource(1);
        }
@@ -222,6 +247,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            goods.setSupplierClinicId(crmClinic.getId());
            goods.setGoodsSource(2);
        }
@@ -255,6 +285,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            goods.setSupplierClinicId(crmClinic.getId());
            goods.setGoodsSource(2);
        }
@@ -283,6 +318,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            goods.setSupplierClinicId(crmClinic.getId());
            goods.setGoodsSource(2);
        }
@@ -308,6 +348,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            cid = crmClinic.getId();
            if(goods.getGoodsSource()==1){
                String clinicIds = goods.getClinicIds();
@@ -342,6 +387,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            cid = crmClinic.getId();
            for (TErpGoods goods : list) {
                String clinicIds = goods.getClinicIds();
@@ -395,6 +445,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmSupplier.getId();
        }
        if(roleType == 5){
@@ -402,6 +457,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId =crmClinic.getId();
        }

@@ -461,6 +521,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -468,6 +533,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmClinic.getId());
        }

@@ -526,6 +596,11 @@
                    TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                            .eq(TCrmSupplier::getUserId, user.getUserId())
                            .last("LIMIT 1"));
                    // ***
                    if(Objects.isNull(crmSupplier)){
                        SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                        crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
                    }
                    goods.setSupplierClinicId(crmSupplier.getId());
                    goods.setGoodsSource(1);
                }
@@ -534,6 +609,11 @@
                    TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                            .eq(TCrmClinic::getUserId, user.getUserId())
                            .last("LIMIT 1"));
                    // ---
                    if(Objects.isNull(crmClinic)){
                        SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                        crmClinic = crmClinicService.getById(sysUser.getObjectId());
                    }
                    goods.setSupplierClinicId(crmClinic.getId());
                    goods.setGoodsSource(2);
                }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpIssueReportingController.java

@@ -14,6 +14,7 @@
import com.ruoyi.system.model.TErpGoods;
import com.ruoyi.system.model.TErpIssueReporting;
import com.ruoyi.system.query.TErpIssueReportingQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpIssueReportingService;
@@ -45,12 +46,14 @@
    private final TCrmClinicService crmClinicService;
    private final TCrmSupplierService crmSupplierService;
    private final TokenService tokenService;
    private final ISysUserService sysUserService;
    @Autowired
    public TErpIssueReportingController(TErpIssueReportingService erpIssueReportingService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TokenService tokenService) {
    public TErpIssueReportingController(TErpIssueReportingService erpIssueReportingService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TokenService tokenService, ISysUserService sysUserService) {
        this.erpIssueReportingService = erpIssueReportingService;
        this.crmClinicService = crmClinicService;
        this.crmSupplierService = crmSupplierService;
        this.tokenService = tokenService;
        this.sysUserService = sysUserService;
    }

    /**
@@ -66,6 +69,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setReportUserId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -73,6 +81,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setReportUserId(crmClinic.getId());
        }
        return R.ok(erpIssueReportingService.pageList(query));
@@ -92,6 +105,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            dto.setReportUserId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -99,6 +117,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            dto.setReportUserId(crmClinic.getId());
        }
        return R.ok(erpIssueReportingService.save(dto));

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java

@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -66,13 +67,14 @@
    private final TCrmSalespersonService crmSalespersonService;
    private final TErpProcurementCommissionService erpProcurementCommissionService;
    private final TCrmWarehouseService crmWarehouseService;
    private final ISysUserService sysUserService;



    @Autowired
    public TErpProcurementController(TErpProcurementService erpProcurementService, TokenService tokenService, TCrmClinicService crmClinicService, TErpProcurementGoodsService erpProcurementGoodsService
    , TErpGoodsService erpGoodsService, TErpClinicWarehousingService erpClinicWarehousingService, TErpClinicWarehousingBatchService erpClinicWarehousingBatchService,
                                     TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService) {
                                     TCrmSupplierService crmSupplierService, TErpMaintenanceReminderService erpMaintenanceReminderService, TSysOtherConfigService sysOtherConfigService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, TCrmBranchService crmBranchService, TCrmSalespersonService crmSalespersonService, TErpProcurementCommissionService erpProcurementCommissionService, TCrmWarehouseService crmWarehouseService, ISysUserService sysUserService) {
        this.erpProcurementService = erpProcurementService;
        this.tokenService = tokenService;
        this.crmClinicService = crmClinicService;
@@ -91,6 +93,7 @@

        this.crmWarehouseService = crmWarehouseService;

        this.sysUserService = sysUserService;
    }


@@ -161,6 +164,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }
        erpProcurementService.addProcurement(clinicSupplierId, user, dtos);
@@ -178,6 +186,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }
        TErpProcurement tErpProcurement = erpProcurementService.getById(id);
@@ -204,6 +217,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }

@@ -262,6 +280,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }
        ArrayList<DetailProcurementNextVO> detailProcurementNextVOS = new ArrayList<>();
@@ -303,6 +326,11 @@
            crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            clinicSupplierId = crmClinic.getId();
        }
        TErpProcurement erpProcurement = erpProcurementService.getById(dto.getId());

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java

@@ -13,10 +13,7 @@
import com.ruoyi.system.model.TCrmClinic;
import com.ruoyi.system.model.TCrmSupplier;
import com.ruoyi.system.query.*;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import com.ruoyi.web.core.config.LakalaConfig;
import io.swagger.annotations.Api;
@@ -26,6 +23,7 @@

import javax.validation.Valid;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -46,15 +44,17 @@
    private final TokenService tokenService;
    private final TCrmClinicService crmClinicService;
    private final TCrmSupplierService crmSupplierService;
    private final ISysUserService sysUserService;

    @Autowired
    public TErpSupplierWarehousingController(TErpSupplierWarehousingService erpSupplierWarehousingService, TErpGoodsService erpGoodsService, TokenService tokenService,
                                             TCrmClinicService crmClinicService,TCrmSupplierService crmSupplierService) {
                                             TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
        this.erpSupplierWarehousingService = erpSupplierWarehousingService;
        this.erpGoodsService = erpGoodsService;
        this.tokenService = tokenService;
        this.crmClinicService = crmClinicService;
        this.crmSupplierService = crmSupplierService;
        this.sysUserService = sysUserService;
    }


@@ -73,6 +73,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -80,6 +85,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setSupplierClinicId(crmClinic.getId());
        }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
@@ -65,8 +66,9 @@
    private final TCrmClinicService crmClinicService;
    private final TokenService tokenService;
    private final TSysOtherConfigService sysOtherConfigService;
    private final ISysUserService sysUserService;
    @Autowired
    public TSysAppUserController(TSysAppUserService sysAppUserService, TSysInspectionService sysInspectionService, TSysOrderService sysOrderService, TSysChronicDiseaseService sysChronicDiseaseService, MsgUtils msgUtils, TSysMessageTemplateService sysMessageTemplateService, TCrmClinicService crmClinicService, TokenService tokenService, TSysOtherConfigService sysOtherConfigService) {
    public TSysAppUserController(TSysAppUserService sysAppUserService, TSysInspectionService sysInspectionService, TSysOrderService sysOrderService, TSysChronicDiseaseService sysChronicDiseaseService, MsgUtils msgUtils, TSysMessageTemplateService sysMessageTemplateService, TCrmClinicService crmClinicService, TokenService tokenService, TSysOtherConfigService sysOtherConfigService, ISysUserService sysUserService) {
        this.sysAppUserService = sysAppUserService;
        this.sysInspectionService = sysInspectionService;
        this.sysOrderService = sysOrderService;
@@ -76,6 +78,7 @@
        this.crmClinicService = crmClinicService;
        this.tokenService = tokenService;
        this.sysOtherConfigService = sysOtherConfigService;
        this.sysUserService = sysUserService;
    }

    /**
@@ -113,6 +116,11 @@
        TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                .eq(TCrmClinic::getUserId, clinicUserId)
                .last("LIMIT 1"));
        // ---
        if(Objects.isNull(crmClinic)){
            SysUser sysUser = sysUserService.selectUserById(clinicUserId);
            crmClinic = crmClinicService.getById(sysUser.getObjectId());
        }
        if(crmClinic == null){
            return R.fail("未找到该诊所信息");
        }
@@ -163,6 +171,11 @@
        Long userId = tokenService.getLoginUser().getUserId();
        TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                .eq(TCrmClinic::getUserId, userId));
        // ---
        if(Objects.isNull(crmClinic)){
            SysUser sysUser = sysUserService.selectUserById(userId);
            crmClinic = crmClinicService.getById(sysUser.getObjectId());
        }
        dto.setClinicId(crmClinic.getId());
        return R.ok(sysAppUserService.save(dto));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java

@@ -52,10 +52,11 @@
    private final TCrmClinicService crmClinicService;
    private final TCrmClinicPointsService crmClinicPointsService;
    private final TCrmChangePointsService crmChangePointsService;
    private final ISysUserService sysUserService;


    @Autowired
    public TSysGoodsController(TokenService tokenService, TSysGoodsService sysGoodsService, TCrmSupplierService crmSupplierService, TSysGoodsExchangeService sysGoodsExchangeService, TCrmClinicService crmClinicService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService) {
    public TSysGoodsController(TokenService tokenService, TSysGoodsService sysGoodsService, TCrmSupplierService crmSupplierService, TSysGoodsExchangeService sysGoodsExchangeService, TCrmClinicService crmClinicService, TCrmClinicPointsService crmClinicPointsService, TCrmChangePointsService crmChangePointsService, ISysUserService sysUserService) {
        this.sysGoodsService = sysGoodsService;
        this.tokenService = tokenService;
        this.crmSupplierService = crmSupplierService;
@@ -65,6 +66,7 @@

        this.crmChangePointsService = crmChangePointsService;

        this.sysUserService = sysUserService;
    }

    /**
@@ -82,6 +84,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            LambdaQueryWrapper<TSysGoods> tSysGoodsLambdaQueryWrapper = new LambdaQueryWrapper<>();
            tSysGoodsLambdaQueryWrapper.eq(TSysGoods::getSupplierId, crmSupplier.getId());
            if (query.getGoodsName() != null && !query.getGoodsName().isEmpty()) {
@@ -120,7 +127,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));

            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            if(crmSupplier.getIsAddPointsGoods() == 2){
                return R.fail("当前供应商已禁止添加积分商品");
            }
@@ -148,6 +159,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            goods.setSupplierId(crmSupplier.getId());
            sysGoodsService.updateById(goods);
            return R.ok(goods.getId());
@@ -166,6 +182,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            TSysGoods goods = sysGoodsService.getById(id);
            if (goods.getSupplierId().equals(crmSupplier.getId())) {
                sysGoodsService.removeById(id);
@@ -187,6 +208,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            TSysGoods goods = sysGoodsService.getById(dto.getId());
            if (goods.getSupplierId().equals(crmSupplier.getId())) {
                goods.setStatus(dto.getState());
@@ -275,6 +301,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            List<TCrmClinicPoints> list = crmClinicPointsService.list(new LambdaQueryWrapper<TCrmClinicPoints>().eq(TCrmClinicPoints::getClinicId, crmClinic.getId()).ge(TCrmClinicPoints::getExpireTime, new Date()).last(" and points > use_points"));
            map.put("myPoints", list.stream().mapToInt(item -> item.getPoints() - item.getUsePoints()).sum());
        }
@@ -305,6 +336,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            sysGoodsService.exchangeGoods(crmClinic, dto);
            return R.ok();
        }
@@ -325,6 +361,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }

            LambdaQueryWrapper<TSysGoodsExchange> eq = new LambdaQueryWrapper<TSysGoodsExchange>().eq(TSysGoodsExchange::getClinicId, crmClinic.getId());
            if (query.getName() != null && !query.getName().isEmpty()) {
@@ -352,6 +393,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            TSysGoodsExchange exchangeServiceById = sysGoodsExchangeService.getById(id);
            if (exchangeServiceById.getClinicId().equals(crmClinic.getId())) {
                ExchangeGoodsRecordDetailVo vo = new ExchangeGoodsRecordDetailVo();
@@ -383,6 +429,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            LambdaQueryWrapper<TCrmChangePoints> eq = new LambdaQueryWrapper<TCrmChangePoints>().eq(TCrmChangePoints::getBranchSalespersonId, crmClinic.getId()).eq(TCrmChangePoints::getUserType, 3);
            if (query.getChangeReason() != null) {
                eq.eq(TCrmChangePoints::getChangeReason, query.getChangeReason());

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysInspectionController.java

@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.TCrmClinic;
import com.ruoyi.system.model.TSysInspection;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TSysInspectionService;
import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -36,11 +39,13 @@
    private final TSysInspectionService sysInspectionService;
    private final TokenService tokenService;
    private final TCrmClinicService crmClinicService;
    private final ISysUserService sysUserService;
    @Autowired
    public TSysInspectionController(TSysInspectionService sysInspectionService, TokenService tokenService, TCrmClinicService crmClinicService) {
    public TSysInspectionController(TSysInspectionService sysInspectionService, TokenService tokenService, TCrmClinicService crmClinicService, ISysUserService sysUserService) {
        this.sysInspectionService = sysInspectionService;
        this.tokenService = tokenService;
        this.crmClinicService = crmClinicService;
        this.sysUserService = sysUserService;
    }

//    /**
@@ -75,6 +80,11 @@
        TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                .eq(TCrmClinic::getUserId, userId)
                .last("LIMIT 1"));
        // ---
        if(Objects.isNull(crmClinic)){
            SysUser sysUser = sysUserService.selectUserById(userId);
            crmClinic = crmClinicService.getById(sysUser.getObjectId());
        }
        dto.setClinicId(crmClinic.getId());
        return R.ok(sysInspectionService.save(dto));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysOrderController.java

@@ -14,10 +14,7 @@
import com.ruoyi.system.model.TSysOrderGoods;
import com.ruoyi.system.query.TSysAppUserQuery;
import com.ruoyi.system.query.TSysOrderQuery;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TSysAppUserService;
import com.ruoyi.system.service.TSysOrderGoodsService;
import com.ruoyi.system.service.TSysOrderService;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TSysOrderDetailVo;
import com.ruoyi.system.vo.TSysOrderPageVo;
import io.swagger.annotations.Api;
@@ -27,6 +24,7 @@

import javax.validation.Valid;
import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -46,17 +44,19 @@
    private final TCrmClinicService crmClinicService;
    private final TSysAppUserService sysAppUserService;
    private final TSysOrderGoodsService sysOrderGoodsService;
    private final ISysUserService sysUserService;



    @Autowired
    public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService) {
    public TSysOrderController(TokenService tokenService, TSysOrderService sysOrderService, TCrmClinicService crmClinicService, TSysAppUserService sysAppUserService, TSysOrderGoodsService sysOrderGoodsService, ISysUserService sysUserService) {
        this.sysOrderService = sysOrderService;
        this.tokenService = tokenService;
        this.crmClinicService = crmClinicService;
        this.sysAppUserService = sysAppUserService;
        this.sysOrderGoodsService = sysOrderGoodsService;

        this.sysUserService = sysUserService;
    }

    /**
@@ -73,6 +73,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setClinicId(crmClinic.getId());
        }
        return R.ok(sysOrderService.pageList(query));
@@ -106,6 +111,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            sysOrderService.add(dto,crmClinic,user.getNickName(),user.getUserId().toString());
            return R.ok("添加成功");
        }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -56,6 +56,12 @@
    @Autowired
    private TCrmClinicService crmClinicService;

    private final ISysUserService sysUserService;

    public SysUserController(ISysUserService sysUserService) {
        this.sysUserService = sysUserService;
    }

    /**
     * 获取用户列表
     */
@@ -74,6 +80,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            query.setObjectId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -81,6 +92,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(userId);
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            query.setObjectId(crmClinic.getId());
        }
        PageInfo<SysUserVO> list = userService.pageList(query);
@@ -189,6 +205,11 @@
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, userId)
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
            }
            user.setObjectId(crmSupplier.getId());
        }
        if(roleType == 5){
@@ -196,6 +217,11 @@
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, userId)
                    .last("LIMIT 1"));
            // ---
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicService.getById(sysUser.getObjectId());
            }
            user.setObjectId(crmClinic.getId());
        }
        user.setRoleType(roleType);

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpClinicWarehousingServiceImpl.java

@@ -14,10 +14,12 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.*;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpClinicWarehousingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -25,10 +27,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -79,6 +78,9 @@
    @Resource
    private TCrmSupplierMapper crmSupplierMapper;

    @Autowired
    private ISysUserService sysUserService;


    @Override
    public PageInfo<PageInventoryListVo> pageInventoryList(TErpInventoryQuery query, SysUser user) {
@@ -89,6 +91,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }
        String sTime = null;
@@ -275,6 +282,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }
        // 获取当前时间后1个月的时间

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpGoodsServiceImpl.java

@@ -15,9 +15,11 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.*;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierInventoryGoodsService;
import com.ruoyi.system.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -25,10 +27,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -95,6 +94,9 @@

    @Resource
    private TErpProcurementMapper erpProcurementMapper;

    @Autowired
    private ISysUserService sysUserService;



@@ -227,6 +229,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -234,6 +241,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }

@@ -272,6 +284,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -279,6 +296,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }

@@ -317,6 +339,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -324,6 +351,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }

@@ -360,6 +392,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -367,6 +404,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }

@@ -534,6 +576,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -541,6 +588,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        TErpSupplierInventory tErpSupplierInventory = new TErpSupplierInventory();
@@ -772,6 +824,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -779,6 +836,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        TErpClinicInventory tErpSupplierInventory = new TErpClinicInventory();

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpMaintenanceReminderServiceImpl.java

@@ -7,16 +7,19 @@
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TErpMaintenanceReminderQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TErpMaintenanceReminderService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.TErpMaintenanceReminderDetailVo;
import com.ruoyi.system.vo.TErpMaintenanceReminderListVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
@@ -65,6 +68,9 @@
    @Resource
    private  TCrmSupplierMapper crmSupplierMapper;

    @Autowired
    private ISysUserService sysUserService;

    @Override
    public PageInfo<TErpMaintenanceReminderListVo> pageList(TErpMaintenanceReminderQuery query, SysUser user) {
        Integer roleType = user.getRoleType();
@@ -74,6 +80,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -81,6 +92,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        PageInfo<TErpMaintenanceReminderListVo> page = new PageInfo<>(query.getPageNum(), query.getPageSize());

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java

@@ -19,6 +19,7 @@
import com.ruoyi.system.query.PerformanceReportQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpProcurementGoodsService;
import com.ruoyi.system.service.TErpProcurementService;
@@ -122,6 +123,9 @@
    @Resource
    private TErpProcurementCommissionMapper erpProcurementCommissionMapper;

    @Autowired
    private ISysUserService sysUserService;


    @Override
    public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {
@@ -134,6 +138,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmSupplier.getId();
        }
        if (roleType == 5) {
@@ -141,6 +150,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }

@@ -258,6 +272,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmSupplier.getId();
        }
        if (roleType == 5) {
@@ -265,6 +284,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId = crmClinic.getId();
        }


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpSupplierWarehousingServiceImpl.java

@@ -18,12 +18,14 @@
import com.ruoyi.system.query.TErpGoodsWarehouseQuery;
import com.ruoyi.system.query.TErpInventoryQuery;
import com.ruoyi.system.query.ValidityPeriodWarningQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TCrmClinicService;
import com.ruoyi.system.service.TCrmSupplierService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.vo.*;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -32,10 +34,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -85,6 +84,8 @@
    @Resource
    private  TCrmSupplierMapper crmSupplierMapper;

    @Autowired
    private ISysUserService sysUserService;
    @Override
    public PageInfo<TErpGoodsVO> pageList(TErpGoodsQuery query, SysUser user) {
        PageInfo<TErpGoodsVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -115,6 +116,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -122,6 +128,12 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }

            supplierClinicId =crmClinic.getId();
        }

@@ -197,6 +209,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -204,6 +221,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        query.setSupplierClinicId(supplierClinicId);
@@ -265,6 +287,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -272,6 +299,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        for (WarehousingGoodsDto dto : dtos) {
@@ -355,6 +387,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -362,6 +399,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        // 获取当前时间后9个月的时间
@@ -385,6 +427,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -392,6 +439,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        String sTime=null;
@@ -558,6 +610,11 @@
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmSupplier)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmSupplier = crmSupplierMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmSupplier.getId();
        }
        if(roleType == 5){
@@ -565,6 +622,11 @@
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            // ***
            if(Objects.isNull(crmClinic)){
                SysUser sysUser = sysUserService.selectUserById(user.getUserId());
                crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());
            }
            supplierClinicId =crmClinic.getId();
        }
        BigDecimal add = new BigDecimal(0);