Compare commits
No commits in common. "da4c1b88ed3bfac34f5cc7d1f0007d41dcd6c075" and "3f5c12bc2c44b07b41e08c55bf843d9e2c829f06" have entirely different histories.
da4c1b88ed
...
3f5c12bc2c
|
@ -121,8 +121,7 @@ public class ResourceController {
|
||||||
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
|
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
|
||||||
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"),
|
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式,可选值(asc、desc)", paramType = "query", dataType = "String"),
|
||||||
@ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String"),
|
@ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String"),
|
||||||
@ApiImplicitParam(name = "delFlag", value = "创建者用户id", paramType = "query", dataType = "String"),
|
@ApiImplicitParam(name = "delFlag", value = "创建者用户id", paramType = "query", dataType = "String")
|
||||||
@ApiImplicitParam(name = "deptId", value = "资源所属部门id", paramType = "query", dataType = "String")
|
|
||||||
})
|
})
|
||||||
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
||||||
PageData<ResourceDTO> page = resourceService.page(params);
|
PageData<ResourceDTO> page = resourceService.page(params);
|
||||||
|
|
|
@ -295,9 +295,6 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
case "creator":
|
case "creator":
|
||||||
wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString());
|
wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString());
|
||||||
break;
|
break;
|
||||||
case "deptId":
|
|
||||||
wrapper.eq(StringUtils.isNotBlank(params.get("deptId").toString()), "dept_id", Long.parseLong(params.get("deptId").toString()));
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue