Merge branch 'master' into 'pro'

Master

See merge request eshop/biz_service_ebtp_extend!39
This commit is contained in:
张银雪
2021-04-25 16:35:44 +08:00

View File

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