Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/service/impl/TenantServiceImpl.java

@@ -93,6 +93,7 @@ public class TenantServiceImpl implements TenantService {
         userEntity.setStatus(0);
         userEntity.setPhone(tenantDto.getPhone());
         userEntity.setUsername(tenantDto.getUserName());
+        userEntity.setUserType("系统管理员");
         userService.addUser(userEntity);
         //创建租户菜单信息
         if(tenantDto.getTenantMenuIds().size()>0){

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -3,7 +3,8 @@
 <mapper namespace="com.huaxu.dao.TenantMapper">
 
     <sql id="Base_Column_List">
-        t.TENANT_NAME as "tenantName"
+        t.id as "id"
+        ,t.TENANT_NAME as "tenantName"
         ,u.id as "userId"
         ,u.USERNAME as "userName"
         ,u.PHONE as "phone"
@@ -154,7 +155,7 @@
     </insert>
     <!-- 通过租户id查询租户菜单id -->
     <select id="selectTenantMenuIds" resultType="java.lang.Integer">
-        select id from uims_tenant_menu where TENANT_ID = #{tenantId}
+        select MENU_ID from uims_tenant_menu where TENANT_ID = #{tenantId}
     </select>
 
     <delete id="deleteTenantMenuIds">