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

This commit is contained in:
GYJ
2025-01-06 14:52:41 +08:00

View File

@@ -238,6 +238,9 @@ public class AppController {
UserInfo userInfo = userInfoService.getByUserId(user.getUserId());
Map<String, Object> map = BeanUtil.beanToMap(user);
map.putAll(BeanUtil.beanToMap(userInfo));
if (StrUtil.isBlank(user.getZhiFuBaoName()) && StrUtil.isNotBlank(userInfo.getCertName())) {
map.put("zhiFuBaoName", userInfo.getCertName());
}
return Result.success().put("data", map);
}