Merge branch 'feature/0822_logoff' into develop-new

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -53,7 +53,7 @@
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="SysUser">
 		SELECT su.* FROM sys_user su
-        WHERE su.del_flag_ = 0 and su.id_ = #{id}
+        WHERE su.id_ = #{id}
 	</select>
 
     <!-- 全查询 -->

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -20,7 +20,6 @@ import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.*;
-import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
@@ -120,9 +119,6 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     @Autowired
     private RedisCacheService redisCacheService;
 
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
     @Override
     public CourseGroupDao getDao() {
         return this.baseMapper;
@@ -1070,7 +1066,7 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
 
     private SysUser getSysUser(Long userId) {
         return Optional.ofNullable(userId)
-                .map(sysUserMapper::getByUserId)
+                .map(sysUserFeignService::queryUserById)
                 .orElseThrow(() -> new BizException("用户不存在"));
     }