lyhzzz 9 months ago
parent
commit
ceb164beb2

+ 16 - 0
src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.entity.JyPlatform;
 import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.*;
@@ -21,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -91,6 +93,20 @@ public class JyUserPlatformServiceImpl extends ServiceImpl<IJyUserPlatformMapper
             param.setIsJm(1);
         }
         Page<JyUserPlatformVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<Integer> ids = page.getRecords().stream().map(JyUserPlatform::getPlatformId).collect(Collectors.toList());
+        HashMap<Integer,JyPlatform> map = new HashMap<>();
+        if(!ids.isEmpty()){
+            List<JyPlatform> jyPlatforms = platformService.listByIds(ids);
+            jyPlatforms.forEach(e -> map.put(e.getId(),e));
+        }
+        for (JyUserPlatformVo record : page.getRecords()) {
+            JyPlatform jyPlatform = map.get(record.getPlatformId());
+            if(jyPlatform != null){
+                record.setPlatformName(jyPlatform.getPlatformName());
+            }else {
+                record.setPlatformName("江门");
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

+ 1 - 1
src/main/java/com/fdkankan/manage/vo/request/JyUserPlatformVo.java

@@ -7,5 +7,5 @@ import lombok.Data;
 public class JyUserPlatformVo extends JyUserPlatform {
     private String ryId;
     private String ryNo;
-    private String platformAddress;
+    private String platformName;
 }

+ 1 - 4
src/main/resources/mapper/manage/JyUserPlatformMapper.xml

@@ -3,10 +3,7 @@
 <mapper namespace="com.fdkankan.manage.mapper.IJyUserPlatformMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.request.JyUserPlatformVo">
-        select up.id,up.ry_id,up.ry_no,up.id_card,up.ry_nick_name as name ,up.phone,up.platform_id,up.status,up.create_time,jp.platform_address from jy_user up
-        <if test="param.isJm != null and param.isJM == 0">
-            left join jy_platform jp on up.platform_id = jp.id
-        </if>
+        select up.id,up.ry_id,up.ry_no,up.id_card,up.ry_nick_name as name ,up.phone,up.platform_id,up.status,up.create_time from jy_user up
         where up.rec_status = 'A'
         <if test="param.isJm != null and param.isJM == 1">
             and up.is_jm =1