diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java index 2d2e576..8d1e14d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysUserAttentionController.java @@ -34,7 +34,7 @@ public class SysUserAttentionController { @ApiOperation(value = "添加/取消关注") @RepeatSubmit @GetMapping("/addAttention") - public R addAttention(@RequestParam Long userId) { + public R addAttention(@RequestParam Long userId) { return sysUserAttentionService.addAttention(userId); @@ -73,8 +73,8 @@ public class SysUserAttentionController { * @return */ @ApiOperation(value = "查询关注列表") - @PostMapping("/selectAttention") - public R> selectAttention(@RequestBody PageVo pageVo){ + @PostMapping("/selectAttentionList") + public R> selectAttentionList(@RequestBody PageVo pageVo){ PageInfo sysUserList = sysUserAttentionService.selectAttentionPage(pageVo); diff --git a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java index a9d9e6e..31be3c7 100644 --- a/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java +++ b/mcwl-framework/src/main/java/com/mcwl/framework/config/SecurityConfig.java @@ -157,7 +157,8 @@ public class SecurityConfig { "/attention/selectToAttention", "/WorkFlowVersion/selectVersionByWorkId", "/memberLevel/list", - "/memberLevel/getMemberBenefitList" + "/memberLevel/getMemberBenefitList", + "/attention/selectAttention" ).permitAll() // 静态资源,可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java index 0d9527c..14bb649 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/SysUserAttentionService.java @@ -2,10 +2,8 @@ package com.mcwl.resource.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; -import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.domain.R; import com.mcwl.common.core.domain.entity.SysUser; -import com.mcwl.resource.domain.SysAdvice; import com.mcwl.resource.domain.SysUserAttention; import com.mcwl.resource.domain.SysUserInfo; import com.mcwl.resource.domain.vo.PageVo; @@ -18,7 +16,7 @@ import com.mcwl.resource.domain.vo.PageVo; */ public interface SysUserAttentionService extends IService { - R addAttention(Long userId); + R addAttention(Long userId); Boolean selectAttention(Long userId); diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java index 242185a..04a5be7 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysUserAttentionServiceImpl.java @@ -11,7 +11,10 @@ import com.mcwl.resource.domain.SysAdvice; import com.mcwl.resource.domain.SysUserAttention; import com.mcwl.resource.domain.SysUserInfo; import com.mcwl.resource.domain.vo.PageVo; -import com.mcwl.resource.mapper.*; +import com.mcwl.resource.mapper.ModelImageMapper; +import com.mcwl.resource.mapper.ModelMapper; +import com.mcwl.resource.mapper.SysUserAttentionMapper; +import com.mcwl.resource.mapper.WorkFlowMapper; import com.mcwl.resource.service.SysUserAttentionService; import com.mcwl.system.domain.enums.AdviceEnum; import com.mcwl.system.mapper.SysUserMapper; @@ -50,7 +53,12 @@ public class SysUserAttentionServiceImpl extends ServiceImpl addAttention(Long userId) { + public R addAttention(Long userId) { + + if ( userId.equals(SecurityUtils.getUserId())){ + + return R.ok("不能对自己操作"); + } //查看是否已关注 Boolean aBoolean = selectAttention(userId);