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

FYI

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

@@ -91,6 +91,26 @@ public class SysUserController extends BaseController
         return toAjax(row);
     }
 
+    /**
+     * 新增APP用户
+     */
+//    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @Transactional
+    @PostMapping("/appAdd")
+    public ApiResult<Void> appAdd(@Validated @RequestBody SysUser user)
+    {
+        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),user.getTenantId())))
+        {
+            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        }
+        user.setUserType("00");
+        user.setTenantId(user.getTenantId());
+        user.setCreateBy(user.getUserName());
+        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        int row = userService.insertUser(user);
+        return toAjax(row);
+    }
+
     /**
      * 修改用户
      */

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

@@ -19,6 +19,8 @@ import java.util.List;
 public interface SysTenantConfigMapper extends CrudMapper<SysTenantConfig> {
     List<SysTenantConfigVo> getTenantConfig(@Param("url") String url);
 
+    List<SysTenantConfigVo> getTenantConfig1();
+
     List<SysMenu> getMenuBoxList(@Param("tenantId") Integer tenantId,
                                  @Param("menuType") String menuType);
 }

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

@@ -254,4 +254,4 @@ public class SysPlatformServiceImpl extends AbstractCrudService<SysPlatformMappe
         }
         return arr3;
     }
-}
+}

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

@@ -1,6 +1,7 @@
 package com.usky.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.common.core.util.GlobalUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
@@ -46,6 +47,9 @@ public class SysTenantConfigServiceImpl extends AbstractCrudService<SysTenantCon
     @Override
     public List<SysTenantConfigVo> getTenantConfig(String url) {
         List<SysTenantConfigVo> list = baseMapper.getTenantConfig(url);
+        if (CollectionUtils.isEmpty(list)){
+            list = baseMapper.getTenantConfig1();
+        }
         return list;
     }
 

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

@@ -39,6 +39,15 @@
         </where>
     </select>
 
+    <select id="getTenantConfig1" resultType="com.usky.system.service.vo.SysTenantConfigVo">
+        SELECT
+        b.id as id,a.id as tenantId,ifNULL(b.login_title,a.tenant_name) as loginTitle,b.login_logo,b.login_back_url,b.login_footer,b.login_type,b.label_icon
+        FROM
+        sys_tenant AS a
+        LEFT JOIN sys_tenant_config AS b ON a.id = b.tenant_id
+        LIMIT 1
+    </select>
+
     <select id="getMenuBoxList" resultType="com.usky.system.domain.SysMenu">
         SELECT a.*
         FROM sys_menu AS a