Commit 6d1daf60 authored by 刘林's avatar 刘林

fix(tcm):根据extend、Type、name模糊查询字典

parent dd1a9216
...@@ -122,7 +122,7 @@ public class DataDictionaryController extends BaseController { ...@@ -122,7 +122,7 @@ public class DataDictionaryController extends BaseController {
@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY) @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/getDictByExtendAndTypePage", method = RequestMethod.GET) @RequestMapping(value = "/getDictByExtendAndTypePage", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据extend、Type、name模糊查询字典", notes = "根据extend、Type、name模糊查询字典") @ApiOperation(httpMethod = "GET", value = "根据extend、Type、name模糊查询字典", notes = "根据extend、Type、name模糊查询字典")
public IPage<DataDictionary> getDictByExtendAndTypePage(@RequestParam("extend") String extend, public ResponseModel<IPage<DataDictionary>> getDictByExtendAndTypePage(@RequestParam("extend") String extend,
@RequestParam("type") String type, @RequestParam("type") String type,
@RequestParam(value = "name", required = false) String name, @RequestParam(value = "name", required = false) String name,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
...@@ -130,7 +130,7 @@ public class DataDictionaryController extends BaseController { ...@@ -130,7 +130,7 @@ public class DataDictionaryController extends BaseController {
Page<DataDictionary> page = new Page<DataDictionary>(); Page<DataDictionary> page = new Page<DataDictionary>();
page.setCurrent(current); page.setCurrent(current);
page.setSize(size); page.setSize(size);
return iDataDictionaryService.getDictByExtendsAndTypePage(extend, type, name, page); return ResponseHelper.buildResponse(iDataDictionaryService.getDictByExtendsAndTypePage(extend, type, name, page));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment