diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java index 9fe3bd84..147eb93c 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java @@ -19,8 +19,13 @@ import io.renren.modules.resource.excel.ResourceExcelImportListener; import io.renren.modules.resource.service.ResourceService; import io.renren.modules.resource.videoPreview.AbstractVideoPreviewService; import io.renren.modules.resource.videoPreview.VideoPreviewFactory; +import io.renren.modules.security.user.SecurityUser; +import io.renren.modules.sys.dao.SysUserDao; import io.renren.modules.sys.dto.SysDeptDTO; +import io.renren.modules.sys.dto.SysUserDTO; +import io.renren.modules.sys.entity.SysUserEntity; import io.renren.modules.sys.service.SysDeptService; +import io.renren.modules.sys.service.SysUserService; import io.swagger.annotations.*; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -109,6 +114,8 @@ public class ResourceController { @Autowired private SysDeptService sysDeptService; + private SysUserDao sysUserDao; + @Resource(name = "${hisense.gateway.name}") private ApiGateway apiGateway; @@ -450,15 +457,26 @@ public class ResourceController { if (page == null) page = 1; if (size == null) size = 10; + Long userId = SecurityUser.getUserId(); + if (userId == null){ + return new Result<>().error("请登录"); + } + + SysUserEntity sysUser = sysUserDao.getById(userId); + if (sysUser == null || sysUser.getGuid() == null) { + return new Result<>().error("该账号没有权限"); + } + String url = "http://15.72.158.81/zyjk/ZywMessage.asmx"; String parame = "\n" + "\n" + " \n" + " \n" + - " e8d2fb43-f512-4918-ab47-1141b925af10\n" + - " 1\n" + - " 10\n" + - " \n" + +// " e8d2fb43-f512-4918-ab47-1141b925af10\n" + + String.format("%s", sysUser.getGuid()) + + String.format("%d", page) + + String.format("%d", size) + + title != null ? String.format("%s", title) : "" + " \n" + " \n" + "";