Merge remote-tracking branch 'origin/master'

cy

2023-10-27 8ec414eb3a5173c1f53bd33b73519c78ca79938a

 consum-base/src/main/java/com/consum/base/controller/BaseWarehouseController.java

@@ -13,6 +13,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * @Description 仓库管理
 * @Author 卢庆阳
@@ -49,11 +51,11 @@
     */
    @GetMapping("/list")
    public ResponseValue queryList(BaseWarehouseParam param) {
        FinSysTenantUser sysInfo = this.getSysInfo();
        if (sysInfo == null) {
            return ResponseValue.error("登录用户信息不存在");
        }
        GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param,sysInfo);
//        FinSysTenantUser sysInfo = this.getSysInfo();
//        if (sysInfo == null) {
//            return ResponseValue.error("登录用户信息不存在");
//        }
        GenericPager<BaseWarehouse> pager = this.baseWarehouseService.queryList(param);
        return ResponseValue.success(pager);
    }

@@ -77,7 +79,7 @@
    }

    /**
     * 根据id查询仓库详情
     * 根据仓库id查询仓库详情
     * @author 卢庆阳
     * @Date 2023/10/26
     */
@@ -120,5 +122,21 @@
        return ResponseValue.success();
    }

    /**
     * @Description  根据机构id查询机构仓库
     * @Author 卢庆阳
     * @Date 2023/10/27
     */
    @GetMapping("/select/tenant_warehouse")
    public ResponseValue getByAgencyId(Long agencyId) {
        if (agencyId == null) {
            return ResponseValue.error("机构id为空");
        }
        List<BaseWarehouse> list = this.baseWarehouseService.getByAgencyId(agencyId);
        if (list == null) return ResponseValue.error("查询失败！");
        return ResponseValue.success("查询成功!", list);
    }


}