11.21

src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java

@@ -30,10 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -262,7 +259,11 @@ public class SysMenuRest {
             sysMenuVo.setSid(s.getSid());
             sysMenuVo.setChecked("1");
             query.setSourceSid(s.getSid());
-            sysMenuVo.setChildren(sysMenuService.listAllByRoleSidG(query));
+            List<SysMenuVo> menuVos = sysMenuService.listAllByRoleSidG(query).stream().collect(
+                    Collectors.collectingAndThen(Collectors.toCollection(
+                            () -> new TreeSet<>(Comparator.comparing(p -> p.getName()))), ArrayList::new)
+            );
+            sysMenuVo.setChildren(menuVos);
             list.add(sysMenuVo);
         }
         return rb.success().setData(list);

src/main/java/com/yxt/portal/apiadmin/SysUserRest.java

@@ -437,6 +437,7 @@ public class SysUserRest {
             if(user.getAccountType().equals("3")){
                 return new ResultBean<SysUserVo>().fail().setMsg("此账号不能登录");
             }else if(user.getAccountType().equals("0")){
+                user.setOrgSid("0");
                 SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
                 return new ResultBean<>().success().setData(userInfoOneVo);
             }
@@ -458,6 +459,7 @@ public class SysUserRest {
             if(user.getAccountType().equals("3")){
                 return new ResultBean<SysUserVo>().fail().setMsg("此账号不能登录");
             }else if(user.getAccountType().equals("0")){
+                user.setOrgSid("0");
                 SysUserVo userInfoOneVo = sysUserService.setUserRedisSessionToken(user);
                 return new ResultBean<>().success().setData(userInfoOneVo);
             }
@@ -630,7 +632,7 @@ public class SysUserRest {
         sysOrg.setPsid("0");
         sysOrganizationService.save(sysOrg);
 
-        sysUser.setOrgSid(sysOrg.getSid());
+//        sysUser.setOrgSid(sysOrg.getSid());
         sysUserService.update(sysUser,new QueryWrapper<SysUser>().eq("sid",sysUser.getSid()));
         List<SysSource> sysSources=sysSourceService.list();
         List<SysOrgRegister> sysOrgRegisters=new ArrayList<>();
@@ -658,8 +660,17 @@ public class SysUserRest {
         userInfoOneVo.setOrgName(sysOrg.getName());
 
         SysUserRole sysUserRole=sysUserRoleService.getOne(new QueryWrapper<SysUserRole>().eq("userSid",user.getSid()).eq("roleSid","002"));
-        sysUserRole.setOrgSid(sysOrg.getSid());
-        sysUserRoleService.updateById(sysUserRole);
+        if(null!=sysUserRole){
+            sysUserRole.setOrgSid(sysOrg.getSid());
+            sysUserRoleService.updateById(sysUserRole);
+        }else {
+            SysUserRole r=new SysUserRole();
+            r.setOrgSid(sysOrg.getSid());
+            r.setRoleSid("002");
+            r.setUserSid(user.getSid());
+            sysUserRoleService.save(r);
+        }
+
         sysUserService.updateToken(sysUser.getSid(),userInfoOneVo.getToken());
         return new ResultBean<SysUserVo>().success().setData(userInfoOneVo);
     }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorize.java

@@ -24,8 +24,8 @@ import lombok.Data;
 public class SysOrgAuthorize extends BaseEntity {
     private static final long serialVersionUID = 1L;
     private String orgSid;//组织
-    private String sourceSid;//资源sid
-    private String menuSid;//菜单sid
-    private String funSid;//功能sid
+//    private String sourceSid;//资源sid
+//    private String menuSid;//菜单sid
+//    private String funSid;//功能sid
     private String authorizeGroupSid;//功能sid
 }

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeDto.java

@@ -26,9 +26,9 @@ public class SysOrgAuthorizeDto implements Dto {
 
     private String sid;
     private String orgSid;//组织
-    private String sourceSid;//资源sid
-    private String menuSid;//菜单sid
-    private String funSid;//功能sid
+//    private String sourceSid;//资源sid
+//    private String menuSid;//菜单sid
+//    private String funSid;//功能sid
     private String roleSid;//角色sid
     private String authorizeGroupSid;//功能sid
     private List<String> groupSids;

src/main/java/com/yxt/portal/biz/sysorgauthorize/SysOrgAuthorizeVo.java

@@ -26,9 +26,9 @@ public class SysOrgAuthorizeVo implements Vo {
 
 
     private String orgSid;//组织
-    private String sourceSid;//资源sid
-    private String menuSid;//菜单sid
-    private String funSid;//功能sid
+//    private String sourceSid;//资源sid
+//    private String menuSid;//菜单sid
+//    private String funSid;//功能sid
     private String authorizeGroupSid;//权限组
     private String authorizeGroupName;//权限组
     private String orgName;//权限组

src/main/java/com/yxt/portal/biz/sysuser/SysUser.java

@@ -66,6 +66,7 @@ public class SysUser extends BaseEntity {
 
 	@ApiModelProperty("用户头像")
     private String headImage;
+    @TableField(exist = false)
     private String orgSid;
     private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户‘