diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/WxAppController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/WxAppController.java index 8605a18..a214d59 100644 --- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/WxAppController.java +++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/WxAppController.java @@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.config.TenantContext; import org.jeecg.common.entity.WxApp; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; @@ -22,8 +24,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.Date; +import java.util.List; - /** +/** * @Description: wx_app * @Author: zy * @Date: 2023-06-20 @@ -166,7 +169,16 @@ public class WxAppController extends JeecgController { @GetMapping("/getAppList") public Result getAppList(){ - return Result.OK(wxAppService.list(Wrappers.lambdaQuery().eq(WxApp::getIsEnable,1))); + //租戶 + String params=""; + String tenantId = TenantContext.getTenant(); + if(StringUtils.isNotBlank(tenantId)){ + if(!"0".equals(tenantId)){//非0租户检查小程序所属小程序 + params = tenantId; + } + } + List appList = wxAppService.list(Wrappers.lambdaQuery().eq(StringUtils.isNotBlank(params),WxApp::getTenantId,tenantId).eq(WxApp::getIsEnable,1)); + return Result.OK(appList); } }