|
@@ -290,7 +290,11 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
String tableName = (String) commonEntity.getBasicMap().get("tableName");
|
|
|
Map<String, Object> conditions = JSONObject.parseObject(JSON.toJSONString(commonEntity.getConditionMap()));
|
|
|
CommonEntity common = new CommonEntity();
|
|
|
- Map<String, Object> retMap = commonMapper.getInfoById(tableName, conditions).getResultMap();
|
|
|
+ CommonEntity commonEntity1 = commonMapper.getInfoById(tableName, conditions);
|
|
|
+ if(commonEntity1 == null){
|
|
|
+ return common;
|
|
|
+ }
|
|
|
+ Map<String, Object> retMap = commonEntity1.getResultMap();
|
|
|
Map<String, Object> retMap1 = new HashMap<>();
|
|
|
retMap.keySet().forEach(item -> {
|
|
|
retMap1.put(toUnderScoreCase(item), retMap.get(item));
|