wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

...

This commit is contained in:
wangliwen 2022-04-27 14:08:54 +08:00
parent 989f1586b4
commit a09436b162
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -21,19 +21,11 @@ import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.security.user.UserDetail; import io.renren.modules.security.user.UserDetail;
import io.renren.modules.sys.dto.SysDeptDTO; import io.renren.modules.sys.dto.SysDeptDTO;
import io.renren.modules.sys.service.SysDeptService; import io.renren.modules.sys.service.SysDeptService;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -129,7 +121,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
} }
QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>(); QueryWrapper<AttrEntity> wrapper = new QueryWrapper<>();
wrapper.eq("data_resource_id", resourceEntity.getId()) wrapper.eq("data_resource_id", resourceEntity.getId())
.eq("del_f lag", 0); .eq("del_flag", 0);
List<AttrEntity> attrEntities = attrDao.selectList(wrapper); List<AttrEntity> attrEntities = attrDao.selectList(wrapper);
resourceDTO.setInfoList(attrEntities); resourceDTO.setInfoList(attrEntities);
return resourceDTO; return resourceDTO;

3
renren-admin/src/main/java/io/renren/modules/resourceMountApply/controller/TResourceMountApplyController.java
View File

@ -46,7 +46,8 @@ public class TResourceMountApplyController {
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType = "int"),
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"), @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query", required = true, dataType = "int"),
@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 = "Long")
}) })
// @RequiresPermissions("resourceMountApply:tresourcemountapply:page") // @RequiresPermissions("resourceMountApply:tresourcemountapply:page")
public Result<PageData<TResourceMountApplyDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) { public Result<PageData<TResourceMountApplyDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {

4
renren-admin/src/main/java/io/renren/modules/resourceMountApply/service/impl/TResourceMountApplyServiceImpl.java
View File

@ -22,7 +22,9 @@ public class TResourceMountApplyServiceImpl extends CrudServiceImpl<TResourceMou
@Override @Override
public QueryWrapper<TResourceMountApplyEntity> getWrapper(Map<String, Object> params) { public QueryWrapper<TResourceMountApplyEntity> getWrapper(Map<String, Object> params) {
QueryWrapper<TResourceMountApplyEntity> wrapper = new QueryWrapper<>(); QueryWrapper<TResourceMountApplyEntity> wrapper = new QueryWrapper<>();
if (params.containsKey("creator")) { //查该用户创建的资源
wrapper.eq("creator", Long.valueOf(params.get("creator").toString()));
}
return wrapper; return wrapper;
} }