Merge remote-tracking branch 'origin/develop_master' into develop_3

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/ITsUserService.java

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

adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java

@@ -149,9 +149,9 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
      * @return List<SarMenu>
      */
     @Override
-    public List<SarMenu> getMenu(String userId) {
-/*        UserEO userEO=UserUtils.getUser();
-        String userId= userEO.getUsid();*/
+    public List<SarMenu> getMenu() {
+        UserEO userEO=UserUtils.getUser();
+        String userId= userEO.getUsid();
         List<String> positionIds=tsUserDao.selectPositionIds(userId);
         /**
          * 当用户没有所属岗位，默认给一个other岗位，适用于特定权限外的其他用户