Merge branch 'system-zyj' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysProfileController.java

@@ -50,7 +50,9 @@ public class SysProfileController extends BaseController {
                 .eq(SysUserPerson::getUserId, user.getUserId())
                 .select(SysUserPerson::getIsLoginNotify)
                 .one();
-        user.setIsLoginNotify(one.getIsLoginNotify());
+        if(one != null) {
+            user.setIsLoginNotify(one.getIsLoginNotify());
+        }
 
         Map<String, Object> map = new HashMap<>();
         map.put("user", user);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenant.java

@@ -116,6 +116,11 @@ public class SysTenant implements Serializable {
      */
     private String systemName;
 
+    /**
+     * 涉及领域(1、消防 2、楼宇 3、人防 4、能耗)
+     */
+    private String field;
+
     /**
      * 原租户Id
      */

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/mapper/SysTenantMapper.java

@@ -50,8 +50,10 @@ public interface SysTenantMapper extends CrudMapper<SysTenant> {
     List<SysUserRole> selectSysUserRoleList(@Param("originalTenantId") Integer originalTenantId, @Param("UserId") long UserId);
     void cloneSysRoleMenu(@Param("originalRoleId") long originalRoleId,@Param("roleId") long roleId);
     void insertSysUserRole(@Param("UserId") long UserId,@Param("roleId") long roleId,@Param("tenantId") long tenantId);
+    void insertBaseSpace(@Param("tenantName") String tenantName,@Param("tenantId") long tenantId);
 
     void delSysTenant(@Param("tenantId") Integer tenantId);
+    void delBaseSpace(@Param("tenantId") Integer tenantId);
     void delSysDept(@Param("tenantId") Integer tenantId);
     void delSysUser(@Param("tenantId") Integer tenantId);
     void delSysUserTenant(@Param("tenantId") Integer tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysTenantServiceImpl.java

@@ -124,6 +124,9 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysDept.setCreateBy(SecurityUtils.getUsername());
         iSysDeptService.insertDept(sysDept);
 
+        //base_space
+        sysTenantMapper.insertBaseSpace(sysTenant.getTenantName(),tenantId);
+
         TenantPlatformVo tenantPlatformVo = new TenantPlatformVo();
         tenantPlatformVo.setPlatformIds(new Integer[]{Integer.parseInt(sysTenant.getSystemName())});
         tenantPlatformVo.setRequestId(0);
@@ -152,6 +155,9 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
         sysDept.setCreateBy(SecurityUtils.getUsername());
         iSysDeptService.insertDept(sysDept);
 
+        //base_space
+        sysTenantMapper.insertBaseSpace(sysTenant.getTenantName(),tenantId);
+
         //在用户租户表中添加克隆账号id与租户id绑定关系
         SysUserTenant sysUserTenant = new SysUserTenant();
         sysUserTenant.setUserId(SecurityUtils.getUserId());
@@ -209,6 +215,7 @@ public class SysTenantServiceImpl extends AbstractCrudService<SysTenantMapper, S
     @Override
     public void delTenantData(Integer tenantId) {
         sysTenantMapper.delSysTenant(tenantId);
+        sysTenantMapper.delBaseSpace(tenantId);
         sysTenantMapper.delSysDept(tenantId);
         sysTenantMapper.delSysUser(tenantId);
         sysTenantMapper.delSysUserTenant(tenantId);

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysTenantTwoVo.java

@@ -115,6 +115,11 @@ public class SysTenantTwoVo implements Serializable {
      */
     private String systemName;
 
+    /**
+     * 涉及领域(1、消防 2、楼宇 3、人防 4、能耗)
+     */
+    private String field;
+
 
     /**
      * 系统名称

base-modules/service-system/service-system-biz/src/main/resources/mapper/system/SysTenantMapper.xml

@@ -168,10 +168,17 @@
         insert into sys_user_role (user_id,role_id,tenant_id)
         values(#{UserId},#{roleId},#{tenantId})
     </insert>
+    <insert id="insertBaseSpace">
+        insert into base_space (name,parent_id,type,root_id,path,deep,created_by,create_time,updated_by,update_time,tenant_id)
+        values(#{tenantName},0,1,0,"",1,`root`,sysdate(),`root`,sysdate(),#{tenantId})
+    </insert>
 
     <delete id="delSysTenant">
         delete from sys_tenant WHERE id = #{tenantId}
     </delete>
+    <delete id="delBaseSpace">
+        delete from base_space where tenant_id = #{tenantId}
+    </delete>
     <delete id="delSysDept">
         delete from sys_dept WHERE tenant_id = #{tenantId}
     </delete>