Commit 18fdfc1dffc6028457f5091764b63b8a5bde20d1
1 parent
1b8adeecac
Exists in
master
and in
1 other branch
查重update
Showing 2 changed files with 15 additions and 10 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
View file @
18fdfc1
| ... | ... | @@ -661,11 +661,13 @@ |
| 661 | 661 | baseResponse.setObject(map); |
| 662 | 662 | }else { |
| 663 | 663 | LymsChatInfo chatInfo=lymsChatInfoService.getOne(queryWrapper); |
| 664 | - if(null!=type && chatInfo.getType().equals(type)){ | |
| 665 | - map.put("type", false); | |
| 666 | - } | |
| 667 | - if(null!=illid && illid.equals(chatInfo.getIllid())){ | |
| 668 | - map.put("illid", false); | |
| 664 | + if (null!=chatInfo) { | |
| 665 | + if(null!=type && chatInfo.getType().equals(type)){ | |
| 666 | + map.put("type", false); | |
| 667 | + } | |
| 668 | + if(null!=illid && illid.equals(chatInfo.getIllid())){ | |
| 669 | + map.put("illid", false); | |
| 670 | + } | |
| 669 | 671 | } |
| 670 | 672 | baseResponse.setObject(map); |
| 671 | 673 | } |
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/RegionsController.java
View file @
18fdfc1
| ... | ... | @@ -154,12 +154,15 @@ |
| 154 | 154 | baseResponse.setObject(map); |
| 155 | 155 | }else { |
| 156 | 156 | LymsDict dict=lymsDictService.getOne(queryWrapper); |
| 157 | - if(null!=code && dict.getCode().equals(code)){ | |
| 158 | - map.put("code", false); | |
| 157 | + if (null!=dict) { | |
| 158 | + if(null!=code && dict.getCode().equals(code)){ | |
| 159 | + map.put("code", false); | |
| 160 | + } | |
| 161 | + if(StringUtil.isNotEmpty(value) && value.equals(dict.getValue())){ | |
| 162 | + map.put("value", false); | |
| 163 | + } | |
| 159 | 164 | } |
| 160 | - if(StringUtil.isNotEmpty(value) && value.equals(dict.getValue())){ | |
| 161 | - map.put("value", false); | |
| 162 | - } | |
| 165 | + | |
| 163 | 166 | baseResponse.setObject(map); |
| 164 | 167 | } |
| 165 | 168 | baseResponse.setErrormsg("成功"); |