场景列表平台数据隔离

src/main/java/com/fdkankan/manage/mapper/IJyUserPlatformMapper.java

@@ -1,7 +1,7 @@
 package com.fdkankan.manage.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.manage.entity.JyUserPlatform;
+import com.fdkankan.manage.vo.JyUserPlatform;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.manage.vo.request.JyUserPlatformParam;
 import com.fdkankan.manage.vo.request.JyUserPlatformVo;
@@ -23,5 +23,5 @@ public interface IJyUserPlatformMapper extends BaseMapper<JyUserPlatform> {
 
     Page<JyUserPlatformVo> pageList(Page<Object> objectPage, JyUserPlatformParam param);
 
-    List<JyUserPlatform> queryByKey(@Param("queryKey") String queryKey,@Param("noInIds") List<String> ids);
+    List<JyUserPlatform> queryByKey(@Param("queryKey") String queryKey, @Param("noInIds") List<String> ids);
 }

src/main/java/com/fdkankan/manage/service/IJyUserPlatformService.java

@@ -1,9 +1,7 @@
 package com.fdkankan.manage.service;
 
-import com.fdkankan.manage.entity.JyPlatform;
-import com.fdkankan.manage.entity.JyUserPlatform;
+import com.fdkankan.manage.vo.JyUserPlatform;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.manage.vo.request.JyPlatformVo;
 import com.fdkankan.manage.vo.request.JyUserPlatformAddParam;
 import com.fdkankan.manage.vo.request.JyUserPlatformParam;
 

src/main/java/com/fdkankan/manage/service/impl/JyPlatformServiceImpl.java

@@ -7,8 +7,6 @@ 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.JyUserPlatform;
-import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IJyPlatformMapper;
 import com.fdkankan.manage.service.*;
@@ -23,7 +21,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.WeakHashMap;
 import java.util.stream.Collectors;
 
 /**

src/main/java/com/fdkankan/manage/service/impl/JyUserPlatformServiceImpl.java

@@ -2,13 +2,11 @@ package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.JyUserPlatform;
+import com.fdkankan.manage.vo.JyUserPlatform;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IJyUserPlatformMapper;
 import com.fdkankan.manage.service.IExcelService;
@@ -25,7 +23,6 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * <p>

src/main/java/com/fdkankan/manage/service/impl/ManageService.java

@@ -2,30 +2,24 @@ package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.SaLoginConfig;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.RedisKeyUtil;
-import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.JyUser;
-import com.fdkankan.manage.entity.JyUserPlatform;
 import com.fdkankan.manage.entity.User;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.IJyUserPlatformService;
 import com.fdkankan.manage.service.IJyUserService;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.service.IUserService;
-import com.fdkankan.manage.vo.request.ManageLoginRequest;
 import com.fdkankan.manage.vo.response.ManageLoginResponse;
-import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @Service

src/main/java/com/fdkankan/manage/entity/JyUserPlatform.java

@@ -1,4 +1,4 @@
-package com.fdkankan.manage.entity;
+package com.fdkankan.manage.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -20,51 +20,39 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("jy_user_platform")
 public class JyUserPlatform implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("platform_id")
     private Integer platformId;
 
-    @TableField("jy_user_id")
     private Integer jyUserId;
 
     /**
      * 平台管理员姓名
      */
-    @TableField("name")
     private String name;
 
     /**
      * 平台管理手机号码
      */
-    @TableField("phone")
     private String phone;
     /**
      * 平台管理身份证号码
      */
-    @TableField("id_card")
     private String idCard;
     /**
      * 是否禁用，0否，1是
      */
-    @TableField("status")
     private Integer status;
 
 
-    @TableField("rec_status")
-    @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-    @TableField("create_time")
     private Date createTime;
 
-    @TableField("update_time")
     private Date updateTime;
 
 

src/main/java/com/fdkankan/manage/vo/request/JyUserPlatformVo.java

@@ -1,10 +1,8 @@
 package com.fdkankan.manage.vo.request;
 
-import com.fdkankan.manage.entity.JyUserPlatform;
+import com.fdkankan.manage.vo.JyUserPlatform;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class JyUserPlatformVo extends JyUserPlatform {
     private String ryId;

src/main/resources/mapper/manage/JyUserPlatformMapper.xml

@@ -7,7 +7,7 @@
                            left join jy_platform jp on up.platform_id = jp.id
         where up.rec_status = 'A'  and jp.rec_status = 'A' and jp.status !=0 and up.id_card != jp.id_card
         <if test="param.name != null and param.name !=''">
-            and up.nick_name like concat ('%',#{param.name},'%')
+            and up.ry_nick_name like concat ('%',#{param.name},'%')
         </if>
         <if test="param.phone != null and param.phone !=''">
             and up.phone like concat ('%',#{param.phone},'%')
@@ -24,10 +24,10 @@
         order by  up.id desc
 
     </select>
-    <select id="queryByKey" resultType="com.fdkankan.manage.entity.JyUserPlatform">
+    <select id="queryByKey" resultType="com.fdkankan.manage.vo.JyUserPlatform">
         select  * from  jy_user where rec_status = 'A'
         <if test="queryKey != null and queryKey !=''">
-            and ( nick_name = #{queryKey} or phone = #{queryKey} or id_card = #{queryKey}  )
+            and ( ry_nick_name = #{queryKey} or phone = #{queryKey} or id_card = #{queryKey}  )
         </if>
         <if test="noInIds != null and noInIds.size >0">
             and  id_card not in