角色配置数据权限 bug修复 和 角色新增配置初始权限bug修复

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java

@@ -53,6 +53,13 @@ public class TsResourceController extends BaseController<TsResource> {
         return Result.success(tsResources);
     }
 
+//    @ApiOperation("查询所有资源")
+//    @GetMapping("/getDefault")
+//    public ResponseMessage<List<TsResource>> getDefault(){
+//        List<String> tsResources=tsResourceService.getDefaultByName();
+//        return Result.success(tsResources);
+//    }
+
     @ApiOperation("添加资源")
     @PostMapping("/add")
     public ResponseMessage<Object> addResource(@RequestBody TsResource tsResource){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java

@@ -34,6 +34,8 @@ public interface ITsResourceService extends IService<TsResource> {
 
     List<TsResource> getAll(TsResource tsResource);
 
+    List<String> getDefaultByName();
+
     ResponseMessage<Object> addResource(TsResource tsResource);
 
     ResponseMessage<Object> updateResource(TsResource tsResource);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -155,6 +155,19 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
         return TsResources;
     }
 
+    @Override
+    public List<String> getDefaultByName() {
+        List<String> menusNames=new ArrayList<>();
+        menusNames.add("海外标准法规");
+        menusNames.add("国内标准法规");
+        QueryWrapper<TsResource> tsResourceQueryWrapper=new QueryWrapper<>();
+        tsResourceQueryWrapper.in("MENU_NAME",menusNames);
+        List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
+        List<String> res=new ArrayList<>();
+        TsResources.forEach(tsResource -> res.add(tsResource.getId()));
+        return res;
+    }
+
     /**
      * 添加菜单
      * @param TsResource：菜单信息

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java

@@ -6,6 +6,8 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.login.util.UserUtils;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
+import com.adc.da.slrs.sarResource.entity.TsResource;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
 import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
 import com.adc.da.slrs.sarRole.service.ITsRoleService;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java

@@ -84,7 +84,7 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
      * @param resourceId：权限ID
      */
     @Delete("delete from ts_role_resource where role_id=#{roleId} and resource_id=#{resourceId}")
-    void delResource(String roleId, String resourceId);
+    void delResource(@Param("roleId") String roleId,@Param("resourceId") String resourceId);
 
     /**
      * 通过角色Id列表查询资源Id列表

adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java

@@ -6,6 +6,7 @@ import com.adc.da.slrs.sarMenu.dao.SarMenuDao;
 import com.adc.da.slrs.sarMenu.entity.SarMenu;
 import com.adc.da.slrs.sarMenu.service.ISarMenuService;
 import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
+import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.adc.da.slrs.sarRole.dao.TsRoleDao;
 import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
@@ -42,6 +43,9 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
     @Autowired
     @Lazy
     private ISarUserPersonalMenuService sarUserPersonalMenuService;
+
+    @Autowired
+    private ITsResourceService tsResourceService;
     /**
      * 查询所有角色
      * @return List<TsRole>
@@ -105,6 +109,10 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
             tsRole.setRoleHierarchy(parentRole.getRoleHierarchy()+1);
         }
         tsRoleDao.insert(tsRole);
+        List<String> as=tsResourceService.getDefaultByName();
+        as.forEach(s -> {
+            tsRoleDao.addResource(tsRole.getId(),s);
+        });
         return Result.success();
     }