Merge branch 'dev_plugins' into dev_temp

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<List<FunctionDTO>> queryFunctionList(QueryFunctionListFormDTO formDTO) {
-        return functionService.queryFunctionList(formDTO);
+        return new Result<List<FunctionDTO>>().ok(functionService.getFunctionList(formDTO));
     }
 
     /**

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/FunctionService.java

@@ -102,7 +102,7 @@ public interface FunctionService extends BaseService<FunctionEntity> {
      * @description 查询已上架的所有功能，供下拉框使用
      * @Date 2020/3/23 22:10
      **/
-    Result<List<FunctionDTO>> queryFunctionList(QueryFunctionListFormDTO formDTO);
+    Result<List<FunctionDTO>> queryFunctionList();
 
     /**
      * @param  dto
@@ -111,4 +111,13 @@ public interface FunctionService extends BaseService<FunctionEntity> {
      * @Description  默认功能新增
      **/
     void saveFunction(FunctionDTO dto);
+
+    /**
+     * @param
+     * @return java.util.List<com.epmet.dto.FunctionDTO>
+     * @Author sun
+     * @Description 查询已上架的所有功能，供下拉框使用
+     **/
+    List<FunctionDTO> getFunctionList(QueryFunctionListFormDTO formDTO);
+
 }

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<FunctionDao, FunctionEn
      * @Date 2020/3/23 22:10
      **/
     @Override
-    public Result<List<FunctionDTO>> queryFunctionList(QueryFunctionListFormDTO formDTO) {
-        return new Result<List<FunctionDTO>>().ok(baseDao.selectQueryFunctionList(formDTO));
+    public Result<List<FunctionDTO>> queryFunctionList() {
+        return new Result<List<FunctionDTO>>().ok(baseDao.selectFunctionList());
     }
 
     /**
@@ -162,4 +162,15 @@ public class FunctionServiceImpl extends BaseServiceImpl<FunctionDao, FunctionEn
 
     }
 
+    /**
+     * @param
+     * @return java.util.List<com.epmet.dto.FunctionDTO>
+     * @Author sun
+     * @Description 查询已上架的所有功能，供下拉框使用
+     **/
+    @Override
+    public List<FunctionDTO> getFunctionList(QueryFunctionListFormDTO formDTO) {
+        return baseDao.selectQueryFunctionList(formDTO);
+    }
+
 }