Merge branch 'master' of http://114.135.61.188:53000/UIMS/Code

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

@@ -174,7 +174,7 @@ public class TenantServiceImpl implements TenantService {
         userEntity.setStatus(1);
         userEntity.setPhone(tenantDto.getPhone());
         userEntity.setUsername(tenantDto.getUserName());
-        userEntity.setUserType("1");//租户系统管理员
+        userEntity.setUserType("-999");//租户系统管理员
         userEntity.setRoleId(role.getId().longValue()); //赋值角色
         userEntity.setCompanyOrgId(org.getId().longValue());//公司
         userEntity.setDeptOrgId(org.getId().longValue());//机构

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

@@ -17,7 +17,7 @@
     </sql>
 
     <sql id="tenantJoins">
-        left join uims_user u on t.code=u.TENANT_ID and u.USER_TYPE='1' and u.status =1
+        left join uims_user u on t.code=u.TENANT_ID and u.USER_TYPE='-999' and u.status =1
         left join (
 			select d.DICT_CODE,d.DICT_VALUE
 			from uims_dict p
@@ -149,6 +149,7 @@
                 and t.TENANT_NAME like concat('%',#{tenantDto.tenantName},'%')
             </if>
         </where>
+        order by t.dateCreate desc
     </select>
 
     <!-- 生成租户菜单 -->