diff --git a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java index dda988aa0..83bf7405a 100644 --- a/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java +++ b/hope-winery/src/main/java/com/ruoyi/winery/controller/goods/GoodsMainController.java @@ -59,7 +59,11 @@ public class GoodsMainController extends BaseController { startPage(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(goodsMain); - lqw.eq(!isAdmin(), GoodsMain::getDeptId, getDeptId()); + + // 不是系统管理员且不是小程序用户的时候仅能看到自己部门的 + lqw.eq(!isAdmin() && !getUsername().contains("mini-"), + GoodsMain::getDeptId, getDeptId()); + if (StringUtils.isNotBlank(goodsMain.getGoodsName())) { lqw.like(GoodsMain::getGoodsName, goodsMain.getGoodsName()); diff --git a/mini-app/src/apis/xiao4rApis.js b/mini-app/src/apis/xiao4rApis.js index c9a7a7281..5efc55892 100644 --- a/mini-app/src/apis/xiao4rApis.js +++ b/mini-app/src/apis/xiao4rApis.js @@ -1,4 +1,3 @@ - import request from '../js/request' import { baseUrl } from '../baseDefine' @@ -10,7 +9,6 @@ export const formHeader = { 'Content-Type': 'application/x-www-form-urlencoded' } - /** * 接口 */ @@ -34,10 +32,9 @@ class Xiao4rApis { // 根据字典类型查询字典数据信息 getDicts(dictType) { return request.get({ - url: '/system/dict/data/type/' + dictType, + url: baseUrl + 'system/dict/data/type/' + dictType }) } - } export default new Xiao4rApis() diff --git a/mini-app/src/components/mall/tab/mall-home.wpy b/mini-app/src/components/mall/tab/mall-home.wpy index c6fe3e8cd..12bd15915 100644 --- a/mini-app/src/components/mall/tab/mall-home.wpy +++ b/mini-app/src/components/mall/tab/mall-home.wpy @@ -127,7 +127,7 @@ - +