1

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java

@@ -1,6 +1,7 @@
 package org.dromara.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.web.core.BaseController;
@@ -80,6 +81,21 @@ public class SysDictDataController extends BaseController {
         return R.ok(data);
     }
 
+    /**
+     * 根据字典类型查询字典数据信息
+     *
+     * @param dictType 字典类型
+     */
+    @SaIgnore
+    @GetMapping(value = "/type")
+    public R<List<SysDictDataVo>> dictTypeTenantId(String dictType,String tenantId) {
+        List<SysDictDataVo> data = dictTypeService.dictTypeTenantId(dictType,tenantId);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
     /**
      * 新增字典类型
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java

@@ -20,4 +20,12 @@ public interface SysDictDataMapper extends BaseMapperPlus<SysDictData, SysDictDa
                 .eq(SysDictData::getDictType, dictType)
                 .orderByAsc(SysDictData::getDictSort));
     }
+
+    default List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId){
+        return selectVoList(
+            new LambdaQueryWrapper<SysDictData>()
+                .eq(SysDictData::getDictType, dictType)
+                .eq(SysDictData::getTenantId, tenantId)
+                .orderByAsc(SysDictData::getDictSort));
+    };
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java

@@ -92,4 +92,6 @@ public interface ISysDictTypeService {
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictTypeBo dictType);
+
+    List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java

@@ -208,6 +208,16 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         return !exist;
     }
 
+    //@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    @Override
+    public List<SysDictDataVo> dictTypeTenantId(String dictType, String tenantId) {
+        List<SysDictDataVo> dictDatas = dictDataMapper.dictTypeTenantId(dictType,tenantId);
+        if (CollUtil.isNotEmpty(dictDatas)) {
+            return dictDatas;
+        }
+        return null;
+    }
+
     /**
      * 根据字典类型和字典值获取字典标签
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/reservat/XiaoyuanReservatServiceImpl.java

@@ -193,7 +193,7 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
                     jsonObject.put("date",date);
                     jsonObject.put("title","不可约");
                     String reservatConfigDate = xiaoyuanReservatConfigVo.getReservatConfigDate();
-                    if (String.valueOf(week).contains(reservatConfigDate)){
+                    if (reservatConfigDate.contains(String.valueOf(week))){
                         jsonObject.put("title","可预约");
                         //包含去查询改天是否被预约满
                         lqwr.eq(StringUtils.isNotBlank(bo.getTeacherPhone()), XiaoyuanReservat::getTeacherPhone, bo.getTeacherPhone());