add

问卷信息

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxAppletQuestionController.java

@@ -61,7 +61,7 @@ public class BizWxAppletQuestionController extends BaseController{
 
 
     @ApiOperationSupport(author = "lf", order = 3)
-    @ApiOperation(value = "查看术后问卷详细信息", notes = "权限： 无")
+    @ApiOperation(value = "查看术后问卷回答的详细信息", notes = "权限： 无")
     @GetMapping("/question/detail/{answerId}")
     public CommonResult<BizWebQuestionAnswerDTO> selectQuestionnaireDetail(@PathVariable String answerId) {
         return CommonResult.success(questionAnswerService.selectDetailByAnswerId(answerId));
@@ -86,7 +86,7 @@ public class BizWxAppletQuestionController extends BaseController{
 
     @ApiOperationSupport(author = "lf", order = 6)
     @GetMapping("/groupDetail/{id}")
-    @ApiOperation(value = "获取术后问卷信息",notes = "权限： 无")
+    @ApiOperation(value = "获取术后问卷信息(包含问题)",notes = "权限： 无")
     public CommonResult<BizWebQuestionGroupVO> selectQuestionnaireById(@PathVariable("id") String id) {
         return CommonResult.success(questionGroupService.selectBizQuestionGroupById(id));
     }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/psw/operator/LoginOAuth2PswUserOperator.java

@@ -179,8 +179,15 @@ public class LoginOAuth2PswUserOperator extends AbstractOAuth2PswUserOperator{
 
     @Override
     public OAuth2PswLoginInfoDTO getUserLoginInfo() {
-        String loginId =String.valueOf( SaTokenUtils.getStpUtil().getLoginId());
-        return OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUserService.selectSysUserById(loginId));
+        String currentUserId = LoginUserStrategy.tr.getCurrentUserId();
+        SysUserPO sysUser = sysUserRepository.selectById(currentUserId);
+        OAuth2PswLoginInfoDTO pswLoginInfo = OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUserService.selectSysUserById(currentUserId));
+        if(ObjectUtil.isNull(sysUser)){
+            pswLoginInfo.setHavePassword(Boolean.FALSE);
+        }else {
+            pswLoginInfo.setHavePassword(StrUtil.isNotBlank(sysUser.getPassword()));
+        }
+        return pswLoginInfo;
     }
 
     @Override