liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'pro'

Browse Source 
Master

See merge request eshop/biz_service_ebtp_extend!39
This commit is contained in:
张银雪
2021-04-25 16:35:44 +08:00
parent bc138d98d7 014f2cd942
commit 760e0a2798
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java
View File

@ -1,5 +1,6 @@
package com.chinaunicom.mall.ebtp.extend.templatewarehouse.controller; package com.chinaunicom.mall.ebtp.extend.templatewarehouse.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateWarehouse; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateWarehouse;
import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck;
@ -90,10 +91,11 @@ public class TemplateWarehouseController {
@ApiOperation("查询最低最高版本号") @ApiOperation("查询最低最高版本号")
@GetMapping("/client/check") @GetMapping("/client/check")
public BaseResponse<ClientVersionCheck> getClientByVersion() { public BaseResponse<ClientVersionCheck> getClientByVersion() {
List<ClientVersionCheck> checkList = clientVersionCheckService.list(); QueryWrapper<ClientVersionCheck> query = new QueryWrapper<>(new ClientVersionCheck());
if (checkList.isEmpty()){ ClientVersionCheck check = clientVersionCheckService.getOne(query);
if (check == null){
return BaseResponse.fail(new ClientVersionCheck()); return BaseResponse.fail(new ClientVersionCheck());
} }
return BaseResponse.success(checkList.get(0)); return BaseResponse.success(check);
} }
} }