add

查询宣教文档的列表(用户没有绑定医院时的请求数据)

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizWxUserServiceImpl.java

@@ -170,7 +170,6 @@ public class BizWxUserServiceImpl implements IBizWxUserService {
         wxUserPO.setLastLoginTime(loginTime);
         wxUserPO.setLastLoginAddress(cityInfo);
         baseRepository.updateById(wxUserPO);
-        sysUserService.delUserIdAndNickNameCache();
     }
 
     @Override

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/config/WxAppletOauth2UserOperator.java

@@ -86,10 +86,15 @@ public class WxAppletOauth2UserOperator extends AbstractOAuth2PswUserOperator {
                 wxUser.setLastLoginTime(loginTime);
                 wxUser.setLastLoginIp(ip);
                 wxUser.setLastLoginAddress(cityInfo);
+                wxUser.setLastLoginTenantId(source.getTenantId());
                 if (StrUtil.isNotBlank(sessionInfo.getUnionid())){
                     wxUser.setUnionId(sessionInfo.getUnionid());
                 }
                 wxUserService.insertBizWxUser(wxUser);
+            }else {
+                wxUser.setLastLoginIp(ip);
+                wxUser.setLastLoginTime(loginTime);
+                wxUser.setLastLoginAddress(cityInfo);
             }
 
             StpLogic stpUtil = SaTokenUtils.getStpUtil();

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

@@ -58,12 +58,4 @@ public class WxMissionController extends BaseController {
         return missionDocService.selectMissionDocDetail(docId);
     }
 
-    @ApiOperationSupport(author = "wangzl", order = 1)
-    @ApiOperation(value = "查询宣教文档的列表(用户没有绑定医院时的请求数据)", notes = "权限： 无")
-    @PostMapping("/allKnowledge/query/page")
-    @TenantIgnore
-    public TableDataInfo<BizDeptAndDocVO> selectKnowLedgeDocListNoneTenant(@RequestBody BizWxAllMissionDocQueryDTO query) {
-        startPage();
-        return getDataTable(missionDocService.selectWxAllKnowledgeDocList(query));
-    }
 }

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswReqDTO.java

@@ -34,5 +34,8 @@ public class OAuth2PswReqDTO extends OAuth2DTO {
 	@ApiModelProperty("微信登录码")
 	private String wxAppletCode;
 
+	@ApiModelProperty("微信登录时扫码的租户id")
+	private String tenantId;
+
 
 }