Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -215,7 +215,7 @@ public class KwfDriverService {
         Map<Long, EntCacheResDto> ents = remoteSystemService.queryEntCacheMapByIds(entIds);
         //数据字典
         dictKey = dictKey.stream().distinct().collect(Collectors.toList());
-        Map<String, SysDictResDto> dicts = CollectionUtils.isEmpty(dictKey) ? remoteSystemService.queryDictMapByTypeValues(String.join(Global.COMMA, dictKey)) : null;
+        Map<String, SysDictResDto> dicts = !CollectionUtils.isEmpty(dictKey) ? remoteSystemService.queryDictMapByTypeValues(String.join(Global.COMMA, dictKey)) : null;
 
         /**数据组装**/
         for (KwfDriverVo driver:drivers) {