Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 00957f0c836b80d9052a6ccf673d3b454b646081

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

@@ -22,6 +22,7 @@
import com.ruoyi.system.dto.*;
import com.ruoyi.system.importExcel.TErpGoodsExcel;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TErpGoodsAdminQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TErpGoodsVO;
@@ -115,6 +116,21 @@
            query.setSupplierClinicId(crmClinic.getId());
        }
        return R.ok(erpGoodsService.pageList(query,user));
    }

    /**
     * 获取erp问题上报管理列表
     */
    @ApiOperation(value = "平台获取商品分页列表")
    @PostMapping(value = "/pageAdminList")
    public R<PageInfo<TErpGoodsVO>> pageAdminList(@RequestBody TErpGoodsAdminQuery query) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        if(roleType == 1){
            // 平台
            return R.ok(erpGoodsService.pageAdminList(query));
        }
        return R.ok();
    }


@@ -417,7 +433,7 @@
        return R.ok(erpGoodsService.updateById(goods));
    }

    @ApiOperation(value = "供应商商品详情")
    @ApiOperation(value = "商品详情")
    @GetMapping(value = "/detail/{id}")
    public R<TErpGoods> detail( @PathVariable String  id) {
        TErpGoods goods = erpGoodsService.getById(id);