add:修改用户获取权限，修改pcms数据同步

2021-10-16 09:33:48 +08:00
parent f6836b0615
commit 8b479fca0c
9 changed files with 49 additions and 33 deletions
@@ -62,8 +62,8 @@ public class TsUserController extends BaseController<TsUser> {

    @ApiOperation("查询当前登录用户权限")
    @GetMapping("/menu")
-    public ResponseMessage<List<SarMenu>> getMenu(){
-        List<SarMenu> menus=tsUserService.getMenu();
+    public ResponseMessage<List<SarMenu>> getMenu(@RequestParam("userId") String userId){
+        List<SarMenu> menus=tsUserService.getMenu(userId);
        return Result.success(menus);
    }

@@ -48,7 +48,7 @@ public interface ITsUserService extends IService<TsUser> {
     * 查询当前登录的用户权限
     * @return List<SarMenu>
     */
-    List<SarMenu> getMenu();
+    List<SarMenu> getMenu(String userId);

    List<TsResource> getResource(TsResource tsResource);

@@ -33,6 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;

@@ -148,10 +149,18 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
     * @return List<SarMenu>
     */
    @Override
-    public List<SarMenu> getMenu() {
-        UserEO userEO=UserUtils.getUser();
-        String userId= userEO.getUsid();
+    public List<SarMenu> getMenu(String userId) {
+/*        UserEO userEO=UserUtils.getUser();
+        String userId= userEO.getUsid();*/
        List<String> positionIds=tsUserDao.selectPositionIds(userId);
+        /**
+         * 当用户没有所属岗位，默认给一个other岗位，适用于特定权限外的其他用户
+         * 用户同步时需要将用户配置的系统内的岗位保留
+         */
+
+        if(positionIds == null || positionIds.isEmpty()){
+            positionIds = Arrays.asList(new String[]{"other"});
+        }
        List<String> roleIds=tsPositionService.getRoleIdsByPositionIds(positionIds);
        List<String> menuIds=tsRoleService.getMenuIdsByRoleIds(roleIds);
        return sarMenuService.getMenuByIds(menuIds);