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

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

@@ -93,17 +93,17 @@ public class SysTenantPlatformServiceImpl extends AbstractCrudService<SysTenantP
         queryWrapper1.eq(SysTenantPlatform::getTenantId,tenantId);
         List<SysTenantPlatform> list = this.list(queryWrapper1);
         List<SysPlatformVo> list1 = sysPlatformService.getPlatformAllList();
-        if(CollectionUtils.isNotEmpty(list)){
-            for(int i=0;i<list.size();i++){
+        if(CollectionUtils.isNotEmpty(list1)){
+            for(int j=0;j<list1.size();j++){
                 TenantPlatformListVo tenantPlatformListVo = new TenantPlatformListVo();
-                tenantPlatformListVo.setIsDefault(list.get(i).getIsDefault());
-                tenantPlatformListVo.setIsSelected(1);
-                if(CollectionUtils.isNotEmpty(list1)){
-                    for(int j=0;j<list1.size();j++){
-                        if (list1.get(j).getId().equals(list.get(i).getPlatformId())){
-                            tenantPlatformListVo.setPlatformName(list1.get(j).getPlatformName());
-                            tenantPlatformListVo.setPlatformId(list1.get(j).getId());
-                            tenantPlatformListVo.setIcon(list1.get(j).getIcon());
+                tenantPlatformListVo.setPlatformName(list1.get(j).getPlatformName());
+                tenantPlatformListVo.setPlatformId(list1.get(j).getId());
+                tenantPlatformListVo.setIcon(list1.get(j).getIcon());
+                if(CollectionUtils.isNotEmpty(list)){
+                    for(int i=0;i<list.size();i++){
+                        if (list1.get(j).getId().equals(list.get(i).getPlatformId())) {
+                            tenantPlatformListVo.setIsDefault(list.get(i).getIsDefault());
+                            tenantPlatformListVo.setIsSelected(1);
                         }
                     }
                 }

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

@@ -371,13 +371,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT u.* FROM sys_user_tenant ut
         JOIN sys_user u ON ut.user_id = u.user_id
         WHERE ut.tenant_id = #{tenantId} AND
-        u.user_name = #{userName};
+        u.user_name = #{userName}
     </select>
 
 	<select id="selectUserTenantDataOne" resultMap="SysUserResult">
         SELECT u.* FROM sys_user_tenant ut
         JOIN sys_user u ON ut.user_id = u.user_id
         WHERE ut.tenant_id = #{tenantId} AND
-        u.phonenumber = #{phone};
+        u.phonenumber = #{phone}
     </select>
 </mapper>