记得上下班打卡 | git大法好,push需谨慎

Commit 85d8283c authored by 张国柄's avatar 张国柄

fix:adam

parent fac5dc94
...@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams; ...@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -49,8 +50,9 @@ public class AdamMemberController { ...@@ -49,8 +50,9 @@ public class AdamMemberController {
memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId())); memberVo.setRightsVoList(adamRdmService.getMemberRightsVoByMemberId(memberVo.getMemberId()));
if (CurrentUtil.isLogged()) { String currentUid = CurrentUtil.getCurrentUid();
memberVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(CurrentUtil.getCurrentUid())); if (!StringUtils.isEmpty(currentUid)) {
memberVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(currentUid));
} }
} }
return ResponseDto.success(memberVo); return ResponseDto.success(memberVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment