工地新版2

pom.xml

@@ -134,13 +134,13 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-spring-boot-starter</artifactId>
-            <version>1.33.0</version>
+            <version>1.34.0</version>
         </dependency>
 
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis-jackson</artifactId>
-            <version>1.33.0</version>
+            <version>1.34.0</version>
         </dependency>
 
 

src/main/java/com/fdkankan/site/controller/MarkingController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.site.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollectionUtil;
 import com.fdkankan.site.common.BaseController;
 import com.fdkankan.site.common.ResultCode;
@@ -54,6 +55,7 @@ public class MarkingController  extends BaseController {
      * 标注列表
      */
     @PostMapping("/list")
+    @SaIgnore
     public ResultData list(@RequestBody MarkingSearchParam param){
         return ResultData.ok(markingService.pageList(param));
     }

src/main/java/com/fdkankan/site/controller/TestController.java

@@ -58,7 +58,7 @@ public class TestController extends BaseController {
 
     @PostMapping("/buildUserRole")
     @SaIgnore
-    public ResultData test1(){
+    public ResultData buildUserRole(){
         for (ProjectTeam projectTeam : projectTeaml.list()) {
             Integer isCreater = projectTeam.getIsCreater();
             UserRole userRole=new UserRole();
@@ -71,9 +71,11 @@ public class TestController extends BaseController {
                 userRole.setUserId(byUserName.getUserId());
                 userRole.setRoleId(2);
             }
-            userRoleService.save(userRole);
+            UserRole byUserIdAndPorId = userRoleService.findByUserIdAndPorId(byUserName.getUserId(), projectTeam.getProjectId());
+            if (ObjectUtil.isNull(byUserIdAndPorId)){
+                userRoleService.save(userRole);
+            }
 
-            projectTeaml.updateById(projectTeam);
         }
         return ResultData.ok( );
     }

src/main/java/com/fdkankan/site/service/IUserRoleService.java

@@ -17,4 +17,8 @@ public interface IUserRoleService extends IService<UserRole> {
 
 
     void delUserRole(Integer userId,Integer projectId);
+
+
+    UserRole findByUserIdAndPorId(Integer userId,Integer projectId);
+
 }

src/main/java/com/fdkankan/site/service/impl/UserRoleServiceImpl.java

@@ -25,4 +25,12 @@ public class UserRoleServiceImpl extends ServiceImpl<IUserRoleMapper, UserRole>
             this.baseMapper.delete(wrapper);
         }
     }
+
+    @Override
+    public UserRole findByUserIdAndPorId(Integer userId, Integer projectId) {
+        LambdaQueryWrapper<UserRole> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(UserRole::getUserId,userId);
+        wrapper.eq(UserRole::getProjectId,projectId);
+        return getOne(wrapper);
+    }
 }