aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: OMS-单票下单优化：收货地区要根据目的国进行判断' (#3) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-oms2c-service/pulls/3
This commit is contained in:
heyu 2025-10-09 16:53:53 +08:00
commit 02f037d2ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java
View File

@ -1,11 +1,11 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisRegionController.java * @Title: EmisRegionController.java
* @author linfso * @author linfso
* @date 2023-11-16 16:18:40 * @date 2023-11-16 16:18:40
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 四级省市区镇表 控制器 </p> * @Description: <p> 四级省市区镇表 控制器 </p>
*/ */
@ -29,7 +29,7 @@ import com.xdadan.erp.oms.service.IEmisRegionService;
/** /**
* 四级省市区镇表Controller * 四级省市区镇表Controller
* *
* @author linfso * @author linfso
* @date 2023-11-16 16:18:40 * @date 2023-11-16 16:18:40
*/ */
@ -51,12 +51,12 @@ public class Oms2cRegionController extends BaseController
return getDataTable(list); return getDataTable(list);
} }
// @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')") // @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
@JacksonFilter(include= {"id","regionCode","regionName","regionNameEn","parentCode"},value= EmisRegion.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include = { "id", "regionCode", "regionName", "regionNameEn", "parentCode", "countryCode",
"countryName" }, value = EmisRegion.class, type = JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listSimple") @RequestMapping("/listSimple")
public TableDataInfo listSimple(EmisRegion emisRegion) public TableDataInfo listSimple(EmisRegion emisRegion) {
{ if (emisRegion.getRegionType() == null) {
if(emisRegion.getRegionType() == null){
TableDataInfo rspData = new TableDataInfo(); TableDataInfo rspData = new TableDataInfo();
rspData.setCode(500); rspData.setCode(500);
rspData.setMsg("参数错误,regionType必传"); rspData.setMsg("参数错误,regionType必传");