Merge branch 'master-dictProvincesCode-childCompany' into 'master'
修改方法,添加条件 See merge request eshop/biz_service_ebtp_project!3
This commit is contained in:
@ -1,6 +1,8 @@
|
||||
package com.chinaunicom.mall.ebtp.project.dict.controller;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
|
||||
import com.chinaunicom.mall.ebtp.project.dict.entity.DictProvincesCode;
|
||||
import com.chinaunicom.mall.ebtp.project.dict.service.IDictProvincesCodeService;
|
||||
@ -85,12 +87,15 @@ public class DictProvincesCodeController{
|
||||
|
||||
/**
|
||||
* 查询所有数据
|
||||
*
|
||||
* @return 返回结果
|
||||
*/
|
||||
@ApiOperation("查询所有数据")
|
||||
@GetMapping("queryAll")
|
||||
public BaseResponse<List<DictProvincesCode>> queryAll(){
|
||||
return BaseResponse.success(idictProvincesCodeService.list());
|
||||
public BaseResponse<List<DictProvincesCode>> queryAll(@RequestParam(value = "childCompany", required = false) Boolean childCompany) {
|
||||
LambdaQueryWrapper<DictProvincesCode> wrapper = Wrappers.lambdaQuery();
|
||||
wrapper.eq(childCompany != null, DictProvincesCode::getChildCompany, childCompany);
|
||||
return BaseResponse.success(idictProvincesCodeService.list(wrapper));
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -57,5 +57,13 @@ public class DictProvincesCode implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "省份地市编码")
|
||||
private String provinces;
|
||||
;
|
||||
|
||||
|
||||
/**
|
||||
* 公司级别
|
||||
*/
|
||||
@ApiModelProperty(value = "公司级别")
|
||||
private Integer childCompany;
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user