增加租户管理字段，更新租户管理部分代码

 Document/Éè¼ÆÎĵµ/×⻧¹ÜÀí¿ª·¢Ä£¿éÎĵµ.docx

Binary files differ

 Document/Éè¼ÆÎĵµ/²Ëµ¥¹ÜÀí¿ª·¢Ä£¿éÎĵµ.docx

Binary files differ

 Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java

@@ -48,6 +48,13 @@
     */
    @ApiModelProperty(value = "租户ID")
    private String tenantId;

    /**
     * ç§Ÿæˆ·å…¨ç§°
     */
    @ApiModelProperty(value = "租户全称")
    private String fullName;

    /**
     * ç§Ÿæˆ·åç§°
     */

 Source/BladeX/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/TenantVO.java

@@ -36,5 +36,6 @@
    /**
     * æ˜¯å¦å¼€å¯ä¸‰å‘˜
     */
    private Boolean membersFlag;
    private Integer ssaEnable;

}

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java

@@ -22,6 +22,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
import lombok.Value;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml

@@ -13,6 +13,7 @@
        <result column="is_deleted" property="isDeleted"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="tenant_name" property="tenantName"/>
        <result column="full_name" property="fullName"/>
        <result column="domain_url" property="domainUrl"/>
        <result column="background_url" property="backgroundUrl"/>
        <result column="linkman" property="linkman"/>

 Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java

@@ -116,8 +116,8 @@
            List<String> codes = tenants.stream().map(Tenant::getTenantId).collect(Collectors.toList());
            String tenantId = getTenantId(codes);
            tenant.setTenantId(tenantId);
            // é…ç½®ä¸ºfalse，并且前端传输的参数为false就不需要创建三员
            if(!this.ssaEnable && !tenant.getMembersFlag()){
            // é…ç½®ä¸ºfalse，并且前端传输的参数为1(未选择开启)就不需要创建三员
            if(!this.ssaEnable && !(tenant.getSsaEnable()==1)){
                // ä¸å¼€å¯ä¸‰å‘˜ç®¡ç†æ—¶ç›´æŽ¥åˆ›å»ºä¸€ä¸ªæœ€é«˜æƒé™çš„管理员
                Role role = new Role(tenantId,BladeConstant.TOP_PARENT_ID,"超级管理员",1,"admin",BladeConstant.DB_NOT_DELETED);
                roleService.save(role);
@@ -127,7 +127,7 @@
                Dept dept = generateDept(tenantId, tenant);
                deptService.save(dept);
                // æ–°å»ºç§Ÿæˆ·å¯¹åº”的默认岗位
                Post postInfo = generatePost(tenantId, 1, "ceo", "首席执行官", 1);
                Post postInfo = generatePost(tenantId, 1, "admin", "管理员", 1);
                postService.save(postInfo);
                // æ–°å»ºç§Ÿæˆ·å¯¹åº”的默认业务字典
                LinkedList<DictBiz> dictBizs = new LinkedList<>();
@@ -161,18 +161,18 @@
                Dept dept = generateDept(tenantId, tenant);
                deptService.save(dept);
                // æ–°å»ºç§Ÿæˆ·å¯¹åº”的默认岗位
                Post postCeo = generatePost(tenantId, 1, "sysAdmin", "系统管理员", 1);
                Post postCto = generatePost(tenantId,1,"secAdmin","安全管理员",4);
                Post postCio = generatePost(tenantId,1,"auditAdmin","审计管理员",5);
                postService.saveBatch(Arrays.asList(postCeo,postCto,postCio));
                Post postSys = generatePost(tenantId, 1, this.ssaNames.get(0), "系统管理员", 1);
                Post postSec = generatePost(tenantId,1,this.ssaNames.get(1),"安全管理员",4);
                Post postAudit = generatePost(tenantId,1,this.ssaNames.get(2),"审计管理员",5);
                postService.saveBatch(Arrays.asList(postSys,postSec,postAudit));
                // æ–°å»ºç§Ÿæˆ·å¯¹åº”的默认业务字典
                LinkedList<DictBiz> dictBizs = new LinkedList<>();
                List<DictBiz> dictBizList = getDictBizs(tenantId, dictBizs);
                dictBizService.saveBatch(dictBizList);
                // æ–°å»ºç§Ÿæˆ·å¯¹åº”的默认管理用户
                User userSys = generateUser(tenantId, roleSys, dept, postCeo);
                User userSec = generateUser(tenantId,roleSec,dept,postCto);
                User userAudit = generateUser(tenantId,roleAudit,dept,postCio);
                User userSys = generateUser(tenantId, roleSys, dept, postSys);
                User userSec = generateUser(tenantId,roleSec,dept,postSec);
                User userAudit = generateUser(tenantId,roleAudit,dept,postAudit);
                // å…ˆä¿å­˜ç§Ÿæˆ·
                boolean temp = super.saveOrUpdate(tenant);
                // åˆ›å»ºç”¨æˆ·
@@ -261,8 +261,8 @@
    private void saveRoleMenus(Role role,List<String> stringMenus){
        LinkedList<Menu> userMenus = new LinkedList<>();
        // èŽ·å–参数配置的默认菜单集合，逗号隔开
        List<String> menuCodes = Func.toStrList(ParamCache.getValue(ACCOUNT_MENU_CODE_KEY));
        List<Menu> menus = getMenus((menuCodes.size() > 0 ? menuCodes : stringMenus), userMenus);
        //List<String> menuCodes = Func.toStrList(ParamCache.getValue(ACCOUNT_MENU_CODE_KEY));
        List<Menu> menus = getMenus((stringMenus), userMenus);
        List<RoleMenu> roleMenus = new ArrayList<>();
        //创建所有菜单角色关联对象
        menus.forEach(menu -> {