1.每个机构只能创建一个仓库 2.去除默认机构默认仓库

futian.liu

2023-12-19 db943c2bb6994c0fe5258af5f82dfb5b61104a0c

 consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseServiceImpl.java

@@ -3,9 +3,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,12 +13,10 @@
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.BaseWarehouseParam;
import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.FinSysTenantDepartmentService;
import com.consum.base.service.FinSysTenantService;
import com.consum.base.service.SDictDataServiceImpl;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantDepartment;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.SDictData;
import com.walker.db.page.GenericPager;
@@ -41,8 +36,6 @@
    private CodeGeneratorService codeGeneratorService;
    @Autowired
    private FinSysTenantService finSysTenantService;
    @Autowired
    private FinSysTenantDepartmentService departmentService;
    @Autowired
    private SDictDataServiceImpl sDictDataService;

@@ -163,36 +156,13 @@
    }

    /**
     * @Description 根据仓库id获取机构用户信息
     * @Author 卢庆阳
     * @Date 2023/10/26
     */
    @Override
    public void queryUserList(Long baseWarehouseId) {
        // 1.根据仓库id查询仓库
        BaseWarehouse baseWarehouse = this.getById(baseWarehouseId);
        if (baseWarehouse != null) {
            Long agencyId = baseWarehouse.getAgencyId();
            String agencyName = baseWarehouse.getAgencyName();
            // 2.根据机构id查询部门
            List<FinSysTenantDepartment> list = this.departmentService.getByTenantId(agencyId);
            // 获取部门id
            Set<Long> deptIds = list.stream().map(dept -> dept.getId()).collect(Collectors.toSet());
            // 3.根据部门id查询用户
            // this.userService.getByDeptIds();

        }

    }

    /**
     * @return
     * @Description 根据机构id查询机构仓库
     * @Author 卢庆阳
     * @Date 2023/10/27
     */
    @Override
    public List<BaseWarehouse> getByAgencyId(Long agencyId, Short isDefault, Short states) {
    public List<BaseWarehouse> getBaseWareHouseList(Long agencyId, Short states) {
        StringBuilder sql = new StringBuilder("SELECT * FROM base_warehouse WHERE 1 = 1 ");
        HashMap<String, Object> paramts = new HashMap<>();

@@ -200,11 +170,6 @@
        if (agencyId != null) {
            sql.append(" and AGENCY_ID =:AGENCY_ID ");
            paramts.put("AGENCY_ID", agencyId);
        }
        // 是否为默认仓库
        if (isDefault != null) {
            sql.append(" and IS_DEFAULT =:isDefault ");
            paramts.put("isDefault", isDefault);
        }
        // 状态
        if (states != null) {
@@ -227,11 +192,8 @@
        Map<String, Object> param = new HashMap<>();
        param.put("agencyId", agencyId);
        List<BaseWarehouse> select = select(sql.toString(), param, new BaseWarehouse());
        Optional<BaseWarehouse> optional = select.stream().findFirst();
        if (optional.isPresent()) {
            return optional.get();
        }
        return null;
        BaseWarehouse baseWarehouse = select.stream().findFirst().orElse(null);
        return baseWarehouse;
    }

    @Override