Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 79c1cc71dfcf2ac2a96433439507e582b7bf23e2

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

@@ -8,6 +8,7 @@
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.dto.TCrmClinicAuditDTO;
import com.ruoyi.system.dto.TCrmClinicDTO;
import com.ruoyi.system.model.*;
@@ -46,8 +47,9 @@
    private final TCrmSalespersonService crmSalespersonService;
    private final ISysUserService sysUserService;
    private final TCrmDeviceService crmDeviceService;
    private final TokenService tokenService;
    @Autowired
    public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService, TCrmDeviceService crmDeviceService) {
    public TCrmClinicController(TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, TCrmBranchService crmBranchService, TCrmWarehouseService crmWarehouseService, TCrmSalespersonService crmSalespersonService, ISysUserService sysUserService, TCrmDeviceService crmDeviceService, TokenService tokenService) {
        this.crmClinicService = crmClinicService;
        this.crmSupplierService = crmSupplierService;
        this.crmBranchService = crmBranchService;
@@ -55,6 +57,7 @@
        this.crmSalespersonService = crmSalespersonService;
        this.sysUserService = sysUserService;
        this.crmDeviceService = crmDeviceService;
        this.tokenService = tokenService;
    }

    /**
@@ -63,6 +66,12 @@
    @ApiOperation(value = "获取crm诊所管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TCrmClinicVO>> pageList(@RequestBody TCrmClinicQuery query) {
        Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
        Long userId = tokenService.getLoginUser().getUserId();
        if(roleType == 2 || roleType == 3){
            query.setUserId(userId);
            query.setRoleType(roleType);
        }
        return R.ok(crmClinicService.pageList(query));
    }