temp commit(wechat_userinfo)

src/main/java/cn/quantgroup/xyqb/repository/IWeChatUserRepository.java

@@ -22,8 +22,6 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
 
     WechatUserInfo findByEncryptedPhoneNoAndAppNameAndTenantId(String phoneNo, String appName, Integer tenantId);
 
-    WechatUserInfo findByUserIdAndAppNameAndAppIdAndTenantId(Long userId, String appName,String appId,Integer tenantId);
-
     WechatUserInfo findFirstByUserIdAndAppNameAndTenantIdOrderByCreatedAtDesc(Long userId, String appName, Integer tenantId);
 
     long countByOpenIdAndAppNameAndAppIdAndTenantId(String openId, String appName,String appId,Integer tenantId);
@@ -40,17 +38,6 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
     @Query(value = "update wechat_userinfo set user_id=null,phone_no='*' where user_id=?1 and app_name=?2 and tenant_id=?3", nativeQuery = true)
     int dissociateByUserIdAndAppNameAndTenantId(Long userId, String appName, Integer tenantId);
 
-    /**
-     * 解除商城用户与小程序和公众号关联关系
-     *
-     * @param userId 用户id
-     * @return 结果
-     */
-    @Transactional(rollbackFor = Exception.class)
-    @Modifying
-    @Query(value = "update wechat_userinfo set user_id=null,phone_no='*' where user_id=?1 and app_name in ('xyqb', 'wuxi')  and tenant_id=?2", nativeQuery = true)
-    int forbiddenXyqbAndWuxiUserByUserIdAndAppIdAndTenantId(Long userId, Integer tenantId);
-
     /**
      * 关联用户
      *
@@ -91,7 +78,7 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
     int updateUserUnionId(Long userId, String appName, String unionId,String appId,Integer tenantId);
 
     @Transactional
-    void deleteByUserIdAndAppIdAndTenantId(Long userId,Integer tenantId);
+    void deleteByUserIdAndTenantId(Long userId, Integer tenantId);
 
     /**
      * 通过userId查询相关绑定微信记录
@@ -101,7 +88,7 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
     /**
      * 通过unionId查询相关绑定微信记录
      */
-    List<WechatUserInfo> findByUnionIdAndAppIdAndTenantId(String unionId, Integer tenantId);
+    List<WechatUserInfo> findByUnionIdAndTenantId(String unionId, Integer tenantId);
 
     List<WechatUserInfo> findByUnionIdInAndTenantId(List<String> unionIds, Integer tenantId);
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -507,7 +507,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         sessionService.deleteUserCatch(user,tenantId);
         /* 禁用微信 Or 删除?*/
 //        wechatService.forbiddenXyqbAndWuxiUserByUserId(user.getId());
-        weChatUserRepository.deleteByUserIdAndAppIdAndTenantId(userId,tenantId);
+        weChatUserRepository.deleteByUserIdAndTenantId(userId,tenantId);
     }
 
     @Override

src/main/java/cn/quantgroup/xyqb/service/wechat/impl/WechatServiceImpl.java

@@ -255,7 +255,7 @@ public class WechatServiceImpl implements IWechatService {
 
     @Override
     public List<WechatUserInfo> queryListByUnionId(String unionId,Integer tenantId) {
-        return weChatUserRepository.findByUnionIdAndAppIdAndTenantId(unionId,tenantId);
+        return weChatUserRepository.findByUnionIdAndTenantId(unionId,tenantId);
     }
 
     @Override