menu

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -102,15 +102,14 @@ public class SysUserController extends PaginationController<SysUser> {
                 businessId);
     }
 
-    @ApiOperation(value = "706 根据id 查询 menu", notes = "根据id 查询 menu")
-    @ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path"),
-            @ApiImplicitParam(name = "modelId", value = "businessId", required = true, dataType = "varchar", paramType = "path")})
+    @ApiOperation(value = "706 根据id 查询菜单", notes = "userId 和 modelId查询 menu")
+    @ApiImplicitParam(name = "modelId", value = "前台菜单10  后台菜单20", required = true, dataType = "varchar", paramType = "path")
     @GetMapping("/queryMenuById")
-    public Result queryMenu(CurUser curUser,String businessId,String modelId) {
+    public Result queryMenu(CurUser curUser,String modelId) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                userServiceImpl.queryMenusById(curUser.getCorpId(),businessId,modelId));
+                userServiceImpl.queryMenusById(curUser.getCorpId(),curUser.getUserId(),modelId));
     }
 
     /**

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -50,7 +50,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "</script>")
     int stopFlag(@Param("businessId") List<String> businessId);
 
-    @Select("<script>select ur.user_id from s_r_user_role ur left JOIN s_role  sr on ur.role_id = sr.business_id where sr.role_name in" +
+    @Select("<script>select ur.user_id from s_r_user_role ur left JOIN tm_admin_role  sr on ur.role_id = sr.r_id where sr.role_name in" +
             "<foreach item='item' index='index' collection='roleName' open='(' separator=',' close=')'> #{item} </foreach> " +
             "</script>")
     List<String> adminId(@Param("roleName") List<String> roleName);
@@ -138,7 +138,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Select("<script>select su.*,ba.`name` as agencyName,sr.role_name as roleName,sr.business_id as roleId from s_user su " +
             "LEFT JOIN s_r_user_role sru on su.business_id = sru.user_id " +
-            "LEFT JOIN s_role sr on sru.role_id = sr.business_id " +
+            "LEFT JOIN tm_admin_role sr on sru.role_id = sr.r_id " +
             "where su.is_created = '1' and su.del_flag = 0 and su.flag = 1  " +
             "</script>")
     @ResultMap(value = "BaseResultMap")