|
@@ -2,6 +2,7 @@ package com.dragonsoft.dcuc.approve.utils;
|
|
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.dragoninfo.dcuc.common.Constants;
|
|
@@ -188,11 +189,18 @@ public class ProofsUtil {
|
|
|
if (MapUtil.isEmpty(extendtions)) {
|
|
|
return headers;
|
|
|
}
|
|
|
- String userToken = extendtions.getOrDefault(UserExtInfoEnum.USER_TOKEN_ID.getValue(), "")
|
|
|
- .toString();
|
|
|
|
|
|
- String appToken = extendtions.getOrDefault(UserExtInfoEnum.APP_TOKEN_ID.getValue(), "")
|
|
|
- .toString();
|
|
|
+ Object userTokenObject = extendtions.get(UserExtInfoEnum.USER_TOKEN_ID.getValue());
|
|
|
+ String userToken = "";
|
|
|
+ if (ObjectUtil.isNotNull(userTokenObject)) {
|
|
|
+ userToken = userTokenObject.toString();
|
|
|
+ }
|
|
|
+ Object appTokenObject = extendtions.get(UserExtInfoEnum.APP_TOKEN_ID.getValue());
|
|
|
+ String appToken = "";
|
|
|
+ if (ObjectUtil.isNotNull(appTokenObject)) {
|
|
|
+ appToken = appTokenObject.toString();
|
|
|
+ }
|
|
|
+
|
|
|
String idcard = currentUser.getIdcard();
|
|
|
String appCode = SecurityUserUtil.getSecurityAppCode();
|
|
|
|