1.解绑申请调整

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantUnbindHistoryController.java

@@ -16,6 +16,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantUnbindHistoryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -61,7 +62,10 @@ public class TenantUnbindHistoryController {
         List<TenantUnbindHistoryWrapper.TenantUnbindHistory> histories = records.stream().map(next -> {
             TenantUnbindHistoryWrapper.TenantUnbindHistory tenantUnbindHistory =
                     JSON.parseObject(JSON.toJSONString(next), TenantUnbindHistoryWrapper.TenantUnbindHistory.class);
-            tenantUnbindHistory.setVerifyUserName(mapByIds.getOrDefault(next.getVerifyUserId(), new SysUser()).getRealName());
+            SysUser orDefault = mapByIds.getOrDefault(next.getVerifyUserId(), new SysUser());
+            tenantUnbindHistory.setVerifyUserName(StringUtils.isEmpty(orDefault.getRealName()) ?
+                    orDefault.getUsername() :
+                    orDefault.getRealName());
             return tenantUnbindHistory;
 
         }).collect(Collectors.toList());