|
@@ -103,7 +103,7 @@ public class SceneCommonService implements ISceneCommonService {
|
|
|
if(param.getStatus() != null){
|
|
|
wrapper.eq(Scene::getStatus,param.getStatus());
|
|
|
}
|
|
|
- wrapper.orderByDesc(Scene::getCreateTime);
|
|
|
+ wrapper.orderByDesc(Scene::getId);
|
|
|
Page<Scene> page = sceneService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|
|
|
List<String> numList = page.getRecords().parallelStream().map(Scene::getSceneCode).collect(Collectors.toList());
|
|
|
|
|
@@ -151,7 +151,7 @@ public class SceneCommonService implements ISceneCommonService {
|
|
|
if(scene.getBuildObjStatus() != null){
|
|
|
switch (scene.getBuildObjStatus()){
|
|
|
case -1: vo.setStatus(1); break;
|
|
|
- case 0: vo.setStatus(0); break;
|
|
|
+ case 0: vo.setStatus(3); break;
|
|
|
case 1: vo.setStatus(2); break;
|
|
|
case 2: vo.setStatus(0); break;
|
|
|
case 3: vo.setStatus(6); break;
|