Merge remote-tracking branch 'origin/dev' into dev

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/core/Jwt/WebMvcConfig.java

@@ -81,7 +81,7 @@
                throw new BusinessException(ResponseStatus.TOKEN_EXCEED_TIME.getCode(),"长时间未操作,请重新登录");
            }
            //获取账号ID
            Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
            String memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
            Integer isDeleted = dao.queryForObject(" select COALESCE(isdeleted,1)  from member where id  = ?", Integer.class, memberId);
            if(isDeleted.equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已删除,请联系管理员");
@@ -90,7 +90,7 @@
            if(isForbidden.equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"用户已禁用,请联系管理员");
            }
            Integer count = dao.queryForObject("select count(1) from `member` where id  = ?", Integer.class, memberId);
            Integer count = dao.queryForObject("select count(1) from member where id  = ?", Integer.class, memberId);
            if (count != null && count > 0) {
                request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
                return true;