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 692fdd2..6df32d4 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java @@ -14,7 +14,9 @@ import com.lyms.talkonlineweb.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 获取区域 @@ -112,6 +114,8 @@ public class RegionsController { public BaseResponse getDictByParam(Integer vtype, Integer code,String value, @RequestParam(required = false) Integer id){ BaseResponse baseResponse=new BaseResponse(); try { + Map map= new HashMap<>(); + map.put("code", true);map.put("value", true); QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq("vtype", vtype); queryWrapper.eq("code", code).or().eq("value",value ); @@ -120,10 +124,24 @@ public class RegionsController { queryWrapper2.eq("id", id); LymsDict dict2=lymsDictService.getOne(queryWrapper2); LymsDict dict=lymsDictService.getOne(queryWrapper); - baseResponse.setObject(null==dict?true:(dict2.getCode().equals(code)&&dict2.getValue().equals(value)?true:false)); + if(null!=dict){ + if(null!=code && dict2.getCode()!=code){ + map.put("code", false); + } + if(StringUtil.isNotEmpty(value) && !value.equals(dict2.getValue())){ + map.put("value", false); + } + } + baseResponse.setObject(map); }else { LymsDict dict=lymsDictService.getOne(queryWrapper); - baseResponse.setObject(null==dict?true:false); + if(null!=code && dict.getCode()==code){ + map.put("code", false); + } + if(StringUtil.isNotEmpty(value) && value.equals(dict.getValue())){ + map.put("value", false); + } + baseResponse.setObject(map); } baseResponse.setErrormsg("成功"); } catch (Exception e) {