From 18fdfc1dffc6028457f5091764b63b8a5bde20d1 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Mon, 23 May 2022 13:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E9=87=8Dupdate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/talkonlineweb/controller/ChatGroupController.java  | 12 +++++++-----
 .../lyms/talkonlineweb/controller/RegionsController.java    | 13 ++++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
index 95859e6..d9baf93 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -661,11 +661,13 @@ public class ChatGroupController {
                 baseResponse.setObject(map);
             }else {
                 LymsChatInfo chatInfo=lymsChatInfoService.getOne(queryWrapper);
-                if(null!=type && chatInfo.getType().equals(type)){
-                    map.put("type", false);
-                }
-                if(null!=illid && illid.equals(chatInfo.getIllid())){
-                    map.put("illid", false);
+                if (null!=chatInfo) {
+                    if(null!=type && chatInfo.getType().equals(type)){
+                        map.put("type", false);
+                    }
+                    if(null!=illid && illid.equals(chatInfo.getIllid())){
+                        map.put("illid", false);
+                    }
                 }
                 baseResponse.setObject(map);
             }
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 7895b35..00ae508 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java
@@ -154,12 +154,15 @@ public class RegionsController {
                 baseResponse.setObject(map);
             }else {
                 LymsDict dict=lymsDictService.getOne(queryWrapper);
-                if(null!=code && dict.getCode().equals(code)){
-                    map.put("code", false);
-                }
-                if(StringUtil.isNotEmpty(value) && value.equals(dict.getValue())){
-                    map.put("value", false);
+                if (null!=dict) {
+                    if(null!=code && dict.getCode().equals(code)){
+                        map.put("code", false);
+                    }
+                    if(StringUtil.isNotEmpty(value) && value.equals(dict.getValue())){
+                        map.put("value", false);
+                    }
                 }
+
                 baseResponse.setObject(map);
             }
             baseResponse.setErrormsg("成功");
-- 
1.8.3.1