bug fix:
1. 知识库一级目录排序; 2. 2个统计数量不返回message;
This commit is contained in:
@@ -9,7 +9,7 @@ public enum StageDataType {
|
||||
|
||||
RADIATION_PROCESS(1, "辐照过程"),
|
||||
TEST_PROCESS(2, "测试过程"),
|
||||
ANNEAL_PROCESS(3, "测试过程"),
|
||||
ANNEAL_PROCESS(3, "退火过程"),
|
||||
|
||||
;
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ public class DocumentLibraryController extends JeecgController<DocumentLibrary,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<DocumentLibrary> queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap());
|
||||
QueryWrapper<DocumentLibrary> queryWrapper = QueryGenerator.initQueryWrapper(documentLibrary, req.getParameterMap()).orderByAsc("tags");
|
||||
Page<DocumentLibrary> page = new Page<DocumentLibrary>(pageNo, pageSize);
|
||||
IPage<DocumentLibrary> pageList = documentLibraryService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
||||
@@ -282,7 +282,9 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
|
||||
experimentLog.setLogContent("修改实验统计");
|
||||
experimentLog.setCreateBy(userByName.getRealname());
|
||||
experimentLogService.save(experimentLog);
|
||||
return Result.OK("编辑成功!");
|
||||
|
||||
// 0503: 修改统计成功,message 不给前端返回。
|
||||
return Result.OK("");
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user