修改默认登录org

sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -94,7 +94,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
         String orgId = loginDTO.getOrgId();
         String orgId = loginDTO.getOrgId();
         String orgName = loginDTO.getOrgName();
         String orgName = loginDTO.getOrgName();
         if (!StringUtils.hasText(loginDTO.getOrgId()) && !StringUtils.hasText(loginDTO.getOrgName())) {
         if (!StringUtils.hasText(loginDTO.getOrgId()) && !StringUtils.hasText(loginDTO.getOrgName())) {
-            orgId = "123456";
+            orgId = "geoSys";
         }
         }
         // check user
         // check user
         UserEntity userEntity = this.getUserByUsername(username);
         UserEntity userEntity = this.getUserByUsername(username);
@@ -105,8 +105,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
         }
         }
         // 修改逻辑 跳过web判定
         // 修改逻辑 跳过web判定
         if (flag != UserTypeEnum.WEB.getVal()) {
         if (flag != UserTypeEnum.WEB.getVal()) {
-            if (flag.intValue() != userEntity.getUserType().intValue()) {
-                return HttpResultResponse.error("The account type does not match.");
+            if (userEntity.getRoleType() == null || userEntity.getRoleType() != RoleTypeEnum.SYS_ADMIN.getVal() ) {
+                if (flag.intValue() != userEntity.getUserType().intValue()) {
+                    return HttpResultResponse.error("The account type does not match.");
+                }
             }
             }
         }
         }
         // 密码加密验证
         // 密码加密验证