feat:去掉租户数据，切换租户报错修复

data/init/sys_app.json

@@ -2,10 +2,10 @@
   {
     "id": 453554819821637,
     "appName": "微信小程序",
-    "appId": "wx5eebdd2bab2d805c",
-    "appSecret": "a92c69537573141d06a59a5c814dd02c",
+    "appId": "xxx",
+    "appSecret": "xxx",
     "appType": "1",
     "remark": "微信小程序",
-    "tenantId": "452748015218757"
+    "tenantId": "000000"
   }
 ]

data/init/sys_dict_data.json

@@ -423,303 +423,5 @@
     "updateBy": null,
     "updateTime": null,
     "remark": "其他操作"
-  },
-  {
-    "id": 452767972405317,
-    "dictLabel": "关闭",
-    "dict_sort": null,
-    "dictType": "sys_notice_status",
-    "dictValue": "1",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "关闭状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972409413,
-    "dictLabel": "新增",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "1",
-    "isDefault": "N",
-    "listClass": "info",
-    "remark": "新增操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972409414,
-    "dictLabel": "修改",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "2",
-    "isDefault": "N",
-    "listClass": "info",
-    "remark": "修改操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972409415,
-    "dictLabel": "删除",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "3",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "删除操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972409416,
-    "dictLabel": "授权",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "4",
-    "isDefault": "N",
-    "listClass": "primary",
-    "remark": "授权操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972409417,
-    "dictLabel": "导出",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "5",
-    "isDefault": "N",
-    "listClass": "warning",
-    "remark": "导出操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972413509,
-    "dictLabel": "导入",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "6",
-    "isDefault": "N",
-    "listClass": "warning",
-    "remark": "导入操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972413510,
-    "dictLabel": "强退",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "7",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "强退操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972413511,
-    "dictLabel": "生成代码",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "8",
-    "isDefault": "N",
-    "listClass": "warning",
-    "remark": "生成操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972413512,
-    "dictLabel": "清空数据",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "9",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "清空操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972413513,
-    "dictLabel": "成功",
-    "dict_sort": null,
-    "dictType": "sys_common_status",
-    "dictValue": "0",
-    "isDefault": "N",
-    "listClass": "primary",
-    "remark": "正常状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972417605,
-    "dictLabel": "失败",
-    "dict_sort": null,
-    "dictType": "sys_common_status",
-    "dictValue": "1",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "停用状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972417606,
-    "dictLabel": "其他",
-    "dict_sort": null,
-    "dictType": "sys_oper_type",
-    "dictValue": "0",
-    "isDefault": "N",
-    "listClass": "info",
-    "remark": "其他操作",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972417607,
-    "dictLabel": "男",
-    "dict_sort": 1,
-    "dictType": "sys_user_sex",
-    "dictValue": "0",
-    "isDefault": "Y",
-    "listClass": "",
-    "remark": "性别男",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972417608,
-    "dictLabel": "显示",
-    "dict_sort": 1,
-    "dictType": "sys_show_hide",
-    "dictValue": "0",
-    "isDefault": "Y",
-    "listClass": "primary",
-    "remark": "显示菜单",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972417609,
-    "dictLabel": "正常",
-    "dict_sort": 1,
-    "dictType": "sys_normal_disable",
-    "dictValue": "0",
-    "isDefault": "Y",
-    "listClass": "primary",
-    "remark": "正常状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972421701,
-    "dictLabel": "是",
-    "dict_sort": 1,
-    "dictType": "sys_yes_no",
-    "dictValue": "Y",
-    "isDefault": "Y",
-    "listClass": "primary",
-    "remark": "系统默认是",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972421702,
-    "dictLabel": "通知",
-    "dict_sort": 1,
-    "dictType": "sys_notice_type",
-    "dictValue": "1",
-    "isDefault": "Y",
-    "listClass": "warning",
-    "remark": "通知",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972421703,
-    "dictLabel": "正常",
-    "dict_sort": 1,
-    "dictType": "sys_notice_status",
-    "dictValue": "0",
-    "isDefault": "Y",
-    "listClass": "primary",
-    "remark": "正常状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972421704,
-    "dictLabel": "女",
-    "dict_sort": 2,
-    "dictType": "sys_user_sex",
-    "dictValue": "1",
-    "isDefault": "N",
-    "remark": "性别女",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972421705,
-    "dictLabel": "隐藏",
-    "dict_sort": 2,
-    "dictType": "sys_show_hide",
-    "dictValue": "1",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "隐藏菜单",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972425797,
-    "dictLabel": "停用",
-    "dict_sort": 2,
-    "dictType": "sys_normal_disable",
-    "dictValue": "1",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "停用状态",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972425798,
-    "dictLabel": "否",
-    "dict_sort": 2,
-    "dictType": "sys_yes_no",
-    "dictValue": "N",
-    "isDefault": "N",
-    "listClass": "danger",
-    "remark": "系统默认否",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972425799,
-    "dictLabel": "公告",
-    "dict_sort": 2,
-    "dictType": "sys_notice_type",
-    "dictValue": "2",
-    "isDefault": "N",
-    "listClass": "success",
-    "remark": "公告",
-    "status": "0",
-    "tenantId": "452748015218757"
-  },
-  {
-    "id": 452767972425800,
-    "dictLabel": "未知",
-    "dict_sort": 3,
-    "dictType": "sys_user_sex",
-    "dictValue": "2",
-    "isDefault": "N",
-    "remark": "性别未知",
-    "status": "0",
-    "tenantId": "452748015218757"
   }
 ]

data/init/sys_role.json

@@ -35,17 +35,4 @@
       "updateTime": null,
       "remark": "普通角色"
     },
-   {
-     "id": 452767970971717,
-     "tenantId": "452748015218757",
-     "roleName": "管理员",
-     "roleKey": "admin",
-     "roleSort": 1,
-     "data_scope": null,
-     "menuCheck_strictly": null,
-     "deptCheck_strictly": null,
-     "status": "0",
-     "delFlag": "0",
-     "remark": "管理员"
-   }
   ]

data/init/sys_user.json

@@ -63,22 +63,5 @@
      "tenantId": "000000",
      "userName": "openiita",
      "userType": "sys_user"
-   },
-   {
-     "id": 452767971950661,
-     "avatar": null,
-     "delFlag": "0",
-     "deptId": 452767971254341,
-     "email": null,
-     "loginIp": null,
-     "nickName": "test",
-     "password": "$2a$10$4Myxy0yK7OUh.y65DNcnKuG9lf3L934CJteU8mx5.Al5PsrIvTnuW",
-     "phonenumber": "18888888888",
-     "remark": "管理员",
-     "sex": null,
-     "status": "0",
-     "tenantId": "452748015218757",
-     "userName": "test",
-     "userType": "sys_user"
    }
   ]

iot-dao/iot-data-serviceImpl-rdb/src/main/java/cc/iotkit/data/service/SysUserDataImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static cc.iotkit.data.model.QTbSysDept.tbSysDept;
@@ -102,9 +103,12 @@ public class SysUserDataImpl implements ISysUserData, IJPACommData<SysUser, Long
 
     @Override
     public SysUser findById(Long id) {
-        TbSysUser sysUser = jpaQueryFactory.select(tbSysUser).from(tbSysUser).where(tbSysUser.id.eq(id)).fetchOne();
+        Optional<TbSysUser> optUser = userRepository.findById(id);
+        if (optUser.isEmpty()) {
+            return null;
+        }
 
-        SysUser convert = MapstructUtils.convert(sysUser, SysUser.class);
+        SysUser convert = MapstructUtils.convert(optUser.get(), SysUser.class);
         List<SysRole> sysRoles = sysRoleData.findByUserId(id);
         convert.setRoles(sysRoles);