diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java index e9e54cf..97a504d 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java @@ -1,6 +1,7 @@ package com.lyms.talkonlineweb.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lyms.talkonlineweb.domain.LymsDict; @@ -123,13 +124,21 @@ public class RegionsController { QueryWrapper queryWrapper2=new QueryWrapper<>(); queryWrapper2.eq("id", id); LymsDict dict2=lymsDictService.getOne(queryWrapper2); - LymsDict dict=lymsDictService.getOne(queryWrapper); - if(null!=dict){ - if(null!=code && dict2.getCode().equals(code)){ - map.put("code", false); + List dictlist=lymsDictService.list(queryWrapper); + if(CollectionUtils.isNotEmpty(dictlist)){ + if(null!=code && !dict2.getCode().equals(code)){ + for (LymsDict dict : dictlist) { + if(dict.getCode().equals(code)){ + map.put("code", false); + } + } } - if(StringUtil.isNotEmpty(value) && !value.equals(dict2.getValue())){ - map.put("value", false); + if(StringUtil.isNotEmpty(value) && !dict2.getValue().equals(value)){ + for (LymsDict dict : dictlist) { + if(dict.getValue().equals(value)){ + map.put("value", false); + } + } } } baseResponse.setObject(map);