Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -194,11 +194,11 @@ public class SysUserController extends BaseController {
             userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
         }
         //先获取角色id
-        SysUserRole sysUserRole1 = userService.selectByAuthId(curUser.getId());
+//        SysUserRole sysUserRole1 = userService.selectByAuthId(curUser.getId());
-        SysUserRole sysUserRole = new SysUserRole();
+//        SysUserRole sysUserRole = new SysUserRole();
-        sysUserRole.setUserId(authAdmin.getId());
+//        sysUserRole.setUserId(authAdmin.getId());
-        sysUserRole.setRoleId(sysUserRole1.getRoleId());
+//        sysUserRole.setRoleId(sysUserRole1.getRoleId());
-        userService.insertUserAuth1(sysUserRole);
+//        userService.insertUserAuth1(sysUserRole);
 
 
         //插入部门