platform / platform-cms · Commits

Go to a project

Authored by mlge
Commit bf54e69dd688c03bcf731edb8bf5112499f082f1 2 parents 758823db 08f7e5c0

Merge branch 'dev_grass_20190108' into test6.8.6

Inline Side-by-side
Showing 3 changed files with 8 additions and 5 deletions
... ... @@ -241,10 +241,10 @@ public class GrassArticleServiceImpl implements IGrassArticleService{
}
int page = req.getPage();
int size = req.getSize();
int total = grassArticleDao.getArticleCount(articleId, source, authStatus,authorUid,startTimeInt, endTimeInt);
int total = grassArticleDao.selectArticleCount(articleId, source, authStatus,authorUid,startTimeInt, endTimeInt);
logger.info("getArticleList: grassArticleDao.getArticleCount: articleId is {}, source is {}, total is {}", articleId, source, total);
int offset = (page - 1) * size;
List<GrassArticle> articleList = grassArticleDao.getArticleList(articleId, source, authStatus,authorUid,startTimeInt, endTimeInt,offset, size);
List<GrassArticle> articleList = grassArticleDao.selectArticleList(articleId, source, authStatus,authorUid,startTimeInt, endTimeInt,offset, size);
PageResponseVO rsp = new PageResponseVO();
rsp.setList(buildArticleDetail(articleList));
rsp.setTotal(total);
... ...
... ... @@ -286,7 +286,7 @@
height: 120
});
} else {
$.messager.alert("失败", data.message, "error");
$.messager.alert("失败", "操作失败，请检查标签是否重名", "error");
}
}
});
... ...
... ... @@ -26,7 +26,7 @@
<body class="easyui-layout" >
<div region="north" style="height: 200px;">
<script>
document.write(addHead('运营管理', '真实用户管理'));
document.write(addHead('种草管理', '真实用户管理'));
</script>
<div style="margin-left: 20px;margin-top: 10px">
... ... @@ -137,6 +137,9 @@
width: 20,
align: "left",
formatter: function (value, rowData, rowIndex) {
if(value == null || value==""){
return "";
}
return '<div><img style="width: 100px;height: 100px" src="'+value+'"/></div>';
}
}, {
... ... @@ -177,7 +180,7 @@
align: "center",
formatter: function (value, rowData, rowIndex) {
var changeStatus = "<a role='changeStatus' style='margin-left:10px;background-color: #ffa951' changedStatus='2' dataId='"+ rowData.uid +"' index='"+ rowIndex +"'>禁言</a>";;
var changeStatus = "<a role='changeStatus' style='margin-left:10px;background-color: #ff3d25' changedStatus='2' dataId='"+ rowData.uid +"' index='"+ rowIndex +"'>禁言</a>";;
if(rowData.isForbidden == 2){
changeStatus = "<a role='changeStatus' style='margin-left:10px;background-color: #ffa951' changedStatus='1' dataId='"+ rowData.uid +"' index='"+ rowIndex +"'>取消禁言</a>";
}
... ...