From 203861aa20ab0ec970017779dc39b6793a60d8fa Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 23 Feb 2022 15:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=90=8Cvtype=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E5=AD=97=E5=85=B8=E7=BC=96=E7=A0=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RegionsController.java              | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

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<String, Boolean> map= new HashMap<>();
+            map.put("code", true);map.put("value", true);
             QueryWrapper<LymsDict> 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) {
-- 
1.8.3.1