diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java index 6be362acc0..2973fbf1cd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionController.java @@ -103,7 +103,7 @@ public class FunctionController { **/ @GetMapping("queryFunctionList") public Result> queryFunctionList(QueryFunctionListFormDTO formDTO) { - return functionService.queryFunctionList(formDTO); + return new Result>().ok(functionService.getFunctionList(formDTO)); } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java index 6654db247e..5f9bc6fad6 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java @@ -102,7 +102,7 @@ public interface FunctionService extends BaseService { * @description 查询已上架的所有功能,供下拉框使用 * @Date 2020/3/23 22:10 **/ - Result> queryFunctionList(QueryFunctionListFormDTO formDTO); + Result> queryFunctionList(); /** * @param dto @@ -111,4 +111,13 @@ public interface FunctionService extends BaseService { * @Description 默认功能新增 **/ void saveFunction(FunctionDTO dto); + + /** + * @param + * @return java.util.List + * @Author sun + * @Description 查询已上架的所有功能,供下拉框使用 + **/ + List getFunctionList(QueryFunctionListFormDTO formDTO); + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java index 5f8344857a..27f835593c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionServiceImpl.java @@ -126,8 +126,8 @@ public class FunctionServiceImpl extends BaseServiceImpl> queryFunctionList(QueryFunctionListFormDTO formDTO) { - return new Result>().ok(baseDao.selectQueryFunctionList(formDTO)); + public Result> queryFunctionList() { + return new Result>().ok(baseDao.selectFunctionList()); } /** @@ -162,4 +162,15 @@ public class FunctionServiceImpl extends BaseServiceImpl + * @Author sun + * @Description 查询已上架的所有功能,供下拉框使用 + **/ + @Override + public List getFunctionList(QueryFunctionListFormDTO formDTO) { + return baseDao.selectQueryFunctionList(formDTO); + } + }