Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppDirPicController.java

@@ -159,7 +159,7 @@ public class TAppDirPicController extends BaseController {
 	})
     public Map<String, Object> getTAppDirPicList(Integer isCurrent) {
 
-        List<TAppDirPic> tAppDirPicList = tAppDirPicService.list(Wrappers.<TAppDirPic>lambdaQuery().eq(isCurrent != null,TAppDirPic::getIsCurrent, isCurrent));
+        List<TAppDirPic> tAppDirPicList = tAppDirPicService.list(Wrappers.<TAppDirPic>lambdaQuery().eq(isCurrent != null,TAppDirPic::getIsCurrent, isCurrent).orderByDesc(TAppDirPic::getCreateTime));
         return getResult(tAppDirPicList);
     }
 
@@ -177,6 +177,7 @@ public class TAppDirPicController extends BaseController {
 		if (StringUtils.isNotBlank(isCurrent)) {
 			queryWrapper.eq(TAppDirPic::getIsCurrent, isCurrent);
 		}
+        queryWrapper.orderByDesc(TAppDirPic::getCreateTime);
 
 		Page<TAppDirPic> page = this.tAppDirPicService.page(getPage(), queryWrapper);
 		for (TAppDirPic tAppDirPic : page.getRecords()) {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppRunPicController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.model.TAppDirPic;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -159,7 +160,7 @@ public class TAppRunPicController extends BaseController {
 			@ApiImplicitParam(name = "isCurrent", value = "是否为当前界面 0：否 1：是", paramType = "query", dataType = "int")
 	})
     public Map<String, Object> getTAppRunPicList(Integer isCurrent) {
-        List<TAppRunPic> tAppRunPicList = tAppRunPicService.list(Wrappers.<TAppRunPic>lambdaQuery().eq(isCurrent!= null,TAppRunPic::getIsCurrent, isCurrent));
+        List<TAppRunPic> tAppRunPicList = tAppRunPicService.list(Wrappers.<TAppRunPic>lambdaQuery().eq(isCurrent!= null,TAppRunPic::getIsCurrent, isCurrent).orderByDesc(TAppRunPic::getCreateTime));
         return getResult(tAppRunPicList);
     }
 
@@ -179,7 +180,7 @@ public class TAppRunPicController extends BaseController {
 		if (StringUtils.isNotBlank(isCurrent)) {
 			queryWrapper.like(TAppRunPic::getIsCurrent, isCurrent);
 		}
-
+		queryWrapper.orderByDesc(TAppRunPic::getCreateTime);
 		Page<TAppRunPic> page = this.tAppRunPicService.page(getPage(), queryWrapper);
 		for (TAppRunPic tAppRunPic : page.getRecords()) {
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppVersionController.java

@@ -134,7 +134,7 @@ public class TAppVersionController extends BaseController {
 	})
     public Map<String, Object> getTAppVersionList(String isCurrent) {
 		QueryWrapper qw  = new QueryWrapper();
-		qw.eq(StringUtils.isNotEmpty(isCurrent),"is_current",isCurrent);
+		qw.eq(StringUtils.isNotEmpty(isCurrent),"is_current",isCurrent).orderByDesc("update_time");
         List<TAppVersion> tAppVersionList = tAppVersionService.list(qw);
         return getResult(tAppVersionList);
     }