1. 个人中心-收藏数据不对

2. 管理员查询不到用户未公开帖子
3. 注册/资料修改 成功后未提示
4. 首页帖子用户头像链接地址错误
This commit is contained in:
2018-06-10 16:58:25 +08:00
parent 08ef1781dd
commit 9e117e9e5b
5 changed files with 21 additions and 9 deletions

View File

@@ -178,7 +178,7 @@ public class BaseServlet extends HttpServlet {
UserInfo userInfo = request.currentUser();
if (userInfo == null){
node.and("status", FilterExpress.NOTEQUAL, 3);
}else {
}else if (!userService.isAdmin(currentId)){
//select * from content c where c.status != -1 and (c.status!=3 or (c.status=3 and c.userId=100001))
node.and(FilterNode.create("status", FilterExpress.NOTEQUAL, 3).or(FilterNode.create("status", 3).and("userId", userInfo.getUserId())));
}

View File

@@ -13,6 +13,7 @@ import org.redkale.util.SelectColumn;
import org.redkale.util.Sheet;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Random;
@@ -167,4 +168,18 @@ public class UserService extends BaseService {
public Number userCount() {
return source.getNumberResult(User.class, FilterFunc.COUNT, "userId", FilterNode.create("status", FilterExpress.NOTEQUAL, -1));
}
@RestMapping(ignore = true, comment = "判断用户是否是管理员")
public boolean isAdmin(int userId){
if (userId <= 0) return false;
List<Integer> userIds = source.queryColumnList("userId", User.class, FilterNode.create("roleId", 1));
for (Integer x : userIds) {
if (userId == x) {
return true;
}
}
return false;
}
}