fix bug: list resource user a error interface. (#1294)

* [maven-release-plugin] prepare release 1.2.1-release

* [maven-release-plugin] prepare for next development iteration

* update

* [maven-release-plugin] prepare release 1.2.0-release

* [maven-release-plugin] prepare for next development iteration

* [maven-release-plugin] prepare release 1.2.1-release

* [maven-release-plugin] prepare for next development iteration

* revert

* [maven-release-plugin] prepare release 1.2.0-release

* [maven-release-plugin] prepare for next development iteration

* add sql files for postgre/mysql

* add sql files

* fix bug: postgre cannot support between.

* fix bug: remove 'between' in sql search.

* add release note

* add release note

* fix bug: list resource user a error interface.

* Fix spelling mistakes

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java

@@ -134,13 +134,13 @@ public class ResourcesController extends BaseController{
      * @param type resource type
      * @return resource list
      */
-    @ApiOperation(value = "querytResourceList", notes= "QUERY_RESOURCE_LIST_NOTES")
+    @ApiOperation(value = "queryResourceList", notes= "QUERY_RESOURCE_LIST_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "RESOURCE_TYPE", required = true, dataType ="ResourceType")
     })
     @GetMapping(value="/list")
     @ResponseStatus(HttpStatus.OK)
-    public Result querytResourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    public Result queryResourceList(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                      @RequestParam(value ="type") ResourceType type
     ){
         try{
@@ -163,7 +163,7 @@ public class ResourcesController extends BaseController{
      * @param pageSize page size
      * @return resource list page
      */
-    @ApiOperation(value = "querytResourceListPaging", notes= "QUERY_RESOURCE_LIST_PAGING_NOTES")
+    @ApiOperation(value = "queryResourceListPaging", notes= "QUERY_RESOURCE_LIST_PAGING_NOTES")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "type", value = "RESOURCE_TYPE", required = true, dataType ="ResourceType"),
             @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", dataType ="String"),
@@ -172,7 +172,7 @@ public class ResourcesController extends BaseController{
     })
     @GetMapping(value="/list-paging")
     @ResponseStatus(HttpStatus.OK)
-    public Result querytResourceListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+    public Result queryResourceListPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                      @RequestParam(value ="type") ResourceType type,
                                      @RequestParam("pageNo") Integer pageNo,
                                      @RequestParam(value = "searchVal", required = false) String searchVal,

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java

@@ -375,7 +375,7 @@ public class ResourcesService extends BaseService {
         if(isAdmin(loginUser)){
             userId = 0;
         }
-        resourceList = resourcesMapper.queryResourceList(null, userId, type.ordinal());
+        resourceList = resourcesMapper.queryResourceListAuthored(userId, type.ordinal());
         result.put(Constants.DATA_LIST, resourceList);
         putMsg(result,Status.SUCCESS);
 

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java

@@ -39,6 +39,15 @@ public interface ResourceMapper extends BaseMapper<Resource> {
                                      @Param("userId") int userId,
                                      @Param("type") int type);
 
+    /**
+     * query resource list
+     * @param userId userId
+     * @param type type
+     * @return resource list
+     */
+    List<Resource> queryResourceListAuthored(
+                                     @Param("userId") int userId,
+                                     @Param("type") int type);
 
     /**
      * resource page