modify

Helius

2021-01-21 663019ae65a0e442f1026619d5a2ea5a68fead7f

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiKnowledgeAction.java

@@ -32,7 +32,7 @@
    @GetMapping(value = "/findKnowledgeType")
    public AjaxResult findKnowledgeType() {
        ArticleType type = new ArticleType();
        type.setShopId(getMe().getShopId());
        type.setShopId(getMe().getCompanyId());
        type.setParentId(0L);
        return AjaxResult.buildSuccessInstance(articleTypeService.findByModel(type));
    }

 zq-erp/src/main/java/com/matrix/system/hive/action/SupplierInfoController.java

@@ -8,9 +8,12 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.bean.SysSupplierInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysSupplierInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -31,6 +34,8 @@
    @Resource
    private CodeService codeService;

    @Autowired
    private SysShopInfoDao shopInfoDao;


    
@@ -93,8 +98,9 @@
    @RequestMapping(value = "/all")
    public @ResponseBody AjaxResult all(SysSupplierInfo sysSupplierInfo) {
        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
        sysSupplierInfo.setShopId(sysUsers.getShopId());
        sysSupplierInfo.setCompanyId(sysUsers.getCompanyId());
        SysShopInfo shopInfo = shopInfoDao.selectZbShop(sysUsers.getCompanyId());
        sysSupplierInfo.setShopId(shopInfo.getId());
        sysSupplierInfo.setCompanyId(shopInfo.getCompanyId());

        return new AjaxResult(AjaxResult.STATUS_SUCCESS,    currentService.findByModel(sysSupplierInfo), 0);
    }