修改逻辑代码

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -570,7 +570,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     private Map<String, Object> getContractParam(TenantInfoInfoPageVo tenantInfo, Date now) {
         //将数据转换为Map
-        Map<String, Object> param = toMap(tenantInfo);
+        Map<String, Object> param = WrapperUtil.toMap(tenantInfo);
         //当前时间
         param.put("nowDate", DateUtils.formatDate(now, "yyyy年MM月dd日"));
         //服务过期时间
@@ -617,13 +617,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         return param;
     }
 
-    private Map toMap(TenantInfoInfoPageVo tenantInfo) {
-        return Optional.ofNullable(tenantInfo)
-                .map(JSONObject::toJSON)
-                .map(o -> JSONObject.toJavaObject((JSONObject) o, Map.class))
-                .orElse(null);
-    }
-
     private static <O, T, S> T opsContractData(O param, Function<O, T> fun, String msg,
                                                BiConsumer<String, Object> putC, String key, Function<T, S> val) {
         Optional<T> optional = Optional.ofNullable(fun.apply(param));

mec-common/common-core/src/main/java/com/ym/mec/common/page/WrapperUtil.java

@@ -1,5 +1,6 @@
 package com.ym.mec.common.page;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ym.mec.common.exception.BizException;
 import org.apache.commons.collections.CollectionUtils;
@@ -241,6 +242,7 @@ public class WrapperUtil<T> {
      * <p> a -> [3,6]
      * <p> b -> [2]
      */
+    @SuppressWarnings("unchecked")
     public static <O> void listDifference(List<O> a, List<O> b) {
         //将ab并集
         Collection<O> abUn = CollectionUtils.retainAll(a, b);
@@ -250,4 +252,15 @@ public class WrapperUtil<T> {
         b.removeAll(abUn);
     }
 
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> toMap(Object obj) {
+        if (obj instanceof Map) {
+            return (Map<String, Object>) obj;
+        }
+        return Optional.ofNullable(obj)
+                .map(JSONObject::toJSON)
+                .map(o -> JSONObject.toJavaObject((JSONObject) o, Map.class))
+                .orElse(new HashMap<String, Object>());
+    }
+
 }