管理员数据转移

gic-platform-auth-api/src/main/java/com/gic/auth/constant/ManagerDataEnum.java

+package com.gic.auth.constant;
+
+/**
+ * 管理员创建数据场景
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:55 PM

+ */
+public enum ManagerDataEnum {
+    /**
+     * 用户分组
+     */
+    CUSTOM_GROUP(1, "用户分组"),
+    /**
+     * 卡券
+     */
+    COUPON(2, "卡券");
+
+    private Integer code;
+    private String message;
+
+    ManagerDataEnum(Integer code, String message){
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserDataShowDTO.java

+package com.gic.auth.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 管理员的数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 1:55 PM

+ */
+public class UserDataShowDTO implements Serializable{
+    private static final long serialVersionUID = 2766130670038380516L;
+
+    /**
+     * id
+     */
+    private Integer userDataId;
+
+    /**
+     * 管理员数据业务方 1:用户分组 2:卡券
+     */
+    private Integer userDataSceneType;
+
+    /**
+     * 管理员创建的业务ID
+     */
+    private String userDataBusinessId;
+
+    /**
+     * 管理员创建的业务名称
+     */
+    private String userDataBusinessName;
+
+    /**
+     * 管理员ID
+     */
+    private Integer userId;
+
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 0:正常 1:删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public Integer getUserDataId() {
+        return userDataId;
+    }
+
+    public UserDataShowDTO setUserDataId(Integer userDataId) {
+        this.userDataId = userDataId;
+        return this;
+    }
+
+    public Integer getUserDataSceneType() {
+        return userDataSceneType;
+    }
+
+    public UserDataShowDTO setUserDataSceneType(Integer userDataSceneType) {
+        this.userDataSceneType = userDataSceneType;
+        return this;
+    }
+
+    public String getUserDataBusinessId() {
+        return userDataBusinessId;
+    }
+
+    public UserDataShowDTO setUserDataBusinessId(String userDataBusinessId) {
+        this.userDataBusinessId = userDataBusinessId;
+        return this;
+    }
+
+    public String getUserDataBusinessName() {
+        return userDataBusinessName;
+    }
+
+    public UserDataShowDTO setUserDataBusinessName(String userDataBusinessName) {
+        this.userDataBusinessName = userDataBusinessName;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public UserDataShowDTO setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public UserDataShowDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public UserDataShowDTO setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public UserDataShowDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public UserDataShowDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserDataShowDTO{" +
+                "userDataId=" + userDataId +
+                ", userDataSceneType=" + userDataSceneType +
+                ", userDataBusinessId='" + userDataBusinessId + '\'' +
+                ", userDataBusinessName='" + userDataBusinessName + '\'' +
+                ", userId=" + userId +
+                ", enterpriseId=" + enterpriseId +
+                ", deleteFlag=" + deleteFlag +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserDataShowSaveDTO.java

+package com.gic.auth.dto;
+
+import java.io.Serializable;
+/**
+ * 管理员数据新增字段
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:01 PM

+ */
+public class UserDataShowSaveDTO implements Serializable{
+    private static final long serialVersionUID = -5755654163143952463L;
+
+    /**
+     * 管理员数据业务方 1:用户分组 2:卡券,枚举类 ManagerDataEnum
+     */
+    private Integer userDataSceneType;
+
+    /**
+     * 管理员创建的业务ID
+     */
+    private String userDataBusinessId;
+
+    /**
+     * 管理员创建的业务名称
+     */
+    private String userDataBusinessName;
+
+    /**
+     * 管理员ID
+     */
+    private Integer userId;
+
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+
+    public Integer getUserDataSceneType() {
+        return userDataSceneType;
+    }
+
+    public UserDataShowSaveDTO setUserDataSceneType(Integer userDataSceneType) {
+        this.userDataSceneType = userDataSceneType;
+        return this;
+    }
+
+    public String getUserDataBusinessId() {
+        return userDataBusinessId;
+    }
+
+    public UserDataShowSaveDTO setUserDataBusinessId(String userDataBusinessId) {
+        this.userDataBusinessId = userDataBusinessId;
+        return this;
+    }
+
+    public String getUserDataBusinessName() {
+        return userDataBusinessName;
+    }
+
+    public UserDataShowSaveDTO setUserDataBusinessName(String userDataBusinessName) {
+        this.userDataBusinessName = userDataBusinessName;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public UserDataShowSaveDTO setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public UserDataShowSaveDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserDataShowSaveDTO{" +
+                "userDataSceneType=" + userDataSceneType +
+                ", userDataBusinessId='" + userDataBusinessId + '\'' +
+                ", userDataBusinessName='" + userDataBusinessName + '\'' +
+                ", userId=" + userId +
+                ", enterpriseId=" + enterpriseId +
+                '}';
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserManagerDataDTO.java

+package com.gic.auth.dto;
+
+import java.io.Serializable;
+
+/**
+ * 管理员创建的数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:41 PM

+ */
+public class UserManagerDataDTO implements Serializable{
+    private static final long serialVersionUID = -469707777563232997L;
+
+    private String id;
+
+    private String name;
+
+    private Integer dataScene;
+
+    public String getId() {
+        return id;
+    }
+
+    public UserManagerDataDTO setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public UserManagerDataDTO setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public Integer getDataScene() {
+        return dataScene;
+    }
+
+    public UserManagerDataDTO setDataScene(Integer dataScene) {
+        this.dataScene = dataScene;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserManagerDataDTO{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", dataScene=" + dataScene +
+                '}';
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserMoveDTO.java

+package com.gic.auth.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 管理员转移记录表
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 9:46 AM

+ */
+public class UserMoveDTO implements Serializable{
+    private static final long serialVersionUID = -3397881386350615640L;
+
+    /**
+     * id
+     */
+    private Integer userMoveId;
+
+    /**
+     * 转移前的用户ID
+     */
+    private Integer fromUserId;
+
+    /**
+     * 转移后的用户ID
+     */
+    private Integer toUserId;
+
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public Integer getUserMoveId() {
+        return userMoveId;
+    }
+
+    public UserMoveDTO setUserMoveId(Integer userMoveId) {
+        this.userMoveId = userMoveId;
+        return this;
+    }
+
+    public Integer getFromUserId() {
+        return fromUserId;
+    }
+
+    public UserMoveDTO setFromUserId(Integer fromUserId) {
+        this.fromUserId = fromUserId;
+        return this;
+    }
+
+    public Integer getToUserId() {
+        return toUserId;
+    }
+
+    public UserMoveDTO setToUserId(Integer toUserId) {
+        this.toUserId = toUserId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public UserMoveDTO setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public UserMoveDTO setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public UserMoveDTO setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "UserMoveDTO{" +
+                "userMoveId=" + userMoveId +
+                ", fromUserId=" + fromUserId +
+                ", toUserId=" + toUserId +
+                ", enterpriseId=" + enterpriseId +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.UserDTO;
 import com.gic.auth.dto.UserListDTO;
+import com.gic.auth.dto.UserManagerDataDTO;
 import com.gic.auth.qo.UserListQO;
 
 import java.util.List;
@@ -296,4 +297,31 @@ public interface UserApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.UserDTO>>

     
*/
     ServiceResponse<List<UserDTO>> listUser(Integer enterpriseId);
+
+    /**
+     * 查询管理员创建的数据场景类型，用于展示转移数据
+     * @param userId
+     * @return
+     */
+    ServiceResponse<List<Integer>> listManagerDataScene(Integer userId);
+
+    /**
+     * 查询管理员自己的管理数据（自己创建的）
+     * @param dataScene 场景类型 ManagerDataEnum枚举
+     * @param userId 管理员ID
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ServiceResponse<Page<UserManagerDataDTO>> queryUserManagerData(Integer dataScene, Integer userId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 查询用户可以转移数据的管理员列表
+     * @param userId
+     * @param search 手机号或者姓名
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ServiceResponse<Page<UserDTO>> queryUserTransferObject(Integer userId, String search, Integer pageNum, Integer pageSize);
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserDataShowApiService.java

+package com.gic.auth.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.UserDataShowSaveDTO;
+
+/**
+ * 管理员的数据记录表，用于前端展示用 （业务方调用）
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 1:57 PM

+ */
+public interface UserDataShowApiService {
+
+    /**
+     * 新增
+     * @param data
+     * @return
+     */
+    ServiceResponse<Void> saveUserData(UserDataShowSaveDTO data);
+
+    /**
+     * 修改名称
+     * @param userDataBusinessId 业务方数据ID
+     * @param userDataBusinessName 业务方数据名称
+     * @param userDataSceneType 业务方 枚举 ManagerDataEnum
+     * @return
+     */
+    ServiceResponse<Void> editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType);
+
+    /**
+     * 删除数据
+     * @param userDataBusinessId
+     * @param userDataSceneType 业务方 枚举 ManagerDataEnum
+     * @return
+     */
+    ServiceResponse<Void> deleteUserData(String userDataBusinessId, Integer userDataSceneType);
+}

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserMoveApiService.java

+package com.gic.auth.service;
+
+import com.gic.api.base.commons.ServiceResponse;
+
+import java.util.List;
+
+/**
+ * 管理员转移记录表
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 9:51 AM

+ */
+public interface UserMoveApiService {
+    /**
+     * 转移记录
+     * @param enterpriseId
+     * @param fromUserId
+     * @param toUserId
+     * @return
+     */
+    ServiceResponse<Void> saveUserMove(Integer enterpriseId, Integer fromUserId, Integer toUserId);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userId
+     * @return
+     */
+    ServiceResponse<List<Integer>> listTransferUserId(Integer userId);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userIdList
+     * @return
+     */
+    ServiceResponse<List<Integer>> listTransferUserId(List<Integer> userIdList);
+}

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java

@@ -131,6 +131,13 @@ public interface TabSysUserMapper {
     List<UserListDTO> listUser(UserListQO params);
 
     /**
+     * 查询符合转移对象的列表
+     * @param params
+     * @return
+     */
+    List<TabSysUser> pageUserForTransfer(UserListQO params);
+
+    /**
      * 逻辑删除
      * @Title: deleteById

      * @Description:

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserResourceMapper.java

@@ -100,4 +100,12 @@ public interface TabSysUserResourceMapper {
      * @return  java.util.List<com.gic.auth.entity.TabSysUserRole>

     
 */
     List<TabSysUserResource> listUserResourceByUserId(@Param("userId") Integer userId);
+
+    /**
+     * 查询包含resourceIdList的user_id
+     * @param resourceIdList
+     * @param enterpriseId
+     * @return
+     */
+    List<Integer> listUserId(@Param("resourceIdList") List<Integer> resourceIdList, @Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserRoleMapper.java

@@ -82,4 +82,12 @@ public interface TabSysUserRoleMapper {
      * @return  java.util.List<com.gic.auth.entity.TabSysUserRole>

     
 */
     List<TabSysUserRole> listUserRoleByRoleId(@Param("roleId") Integer roleId);
+
+    /**
+     * 查询包含roleIdList的user_id
+     * @param roleIdList
+     * @param enterpriseId
+     * @return
+     */
+    List<Integer> listUserId(@Param("roleIdList") List<Integer> roleIdList, @Param("enterpriseId") Integer enterpriseId);
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabUserDataShowMapper.java

+package com.gic.auth.dao.mapper;
+
+import com.gic.auth.entity.TabUserDataShow;
+import org.apache.ibatis.annotations.Param;
+/**
+ * 管理员数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:22 PM

+ */
+public interface TabUserDataShowMapper {
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabUserDataShow record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabUserDataShow record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param userDataId 主键
+     * @return 实体对象
+     */
+    TabUserDataShow selectByPrimaryKey(Integer userDataId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabUserDataShow record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabUserDataShow record);
+
+    /**
+     * 修改名称
+     *
+     * @param userDataBusinessId
+     * @param userDataBusinessName
+     * @param userDataSceneType
+     * @return
+     */
+    int editUserDataBusinessName(@Param("userDataBusinessId") String userDataBusinessId,
+                                 @Param("userDataBusinessName") String userDataBusinessName,
+                                 @Param("userDataSceneType") Integer userDataSceneType);
+
+    /**
+     * 删除
+     * @param userDataBusinessId
+     * @param userDataSceneType
+     * @return
+     */
+    int deleteUserData(@Param("userDataBusinessId")String userDataBusinessId,@Param("userDataSceneType") Integer userDataSceneType);
+}
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/UserMoveMapper.java

+package com.gic.auth.dao.mapper;
+
+import com.gic.auth.entity.TabGicUserMove;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 管理员转移
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 10:31 AM

+ */
+public interface UserMoveMapper {
+
+    /**
+     * 插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insert(TabGicUserMove record);
+
+    /**
+     * 动态插入一条记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int insertSelective(TabGicUserMove record);
+
+    /**
+     * 根据主键查询
+     *
+     * @param userMoveId 主键
+     * @return 实体对象
+     */
+    TabGicUserMove selectByPrimaryKey(Integer userMoveId);
+
+    /**
+     * 根据主键动态更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKeySelective(TabGicUserMove record);
+
+    /**
+     * 根据主键更新记录
+     *
+     * @param record 实体对象
+     * @return 更新条目数
+     */
+    int updateByPrimaryKey(TabGicUserMove record);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userId
+     * @return
+     */
+    List<Integer> listTransferUserId(@Param("userId") Integer userId);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userIdList
+     * @return
+     */
+    List<Integer> listTransferUserIdByUserIdList(@Param("userIdList") List<Integer> userIdList);
+}
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabGicUserMove.java

+package com.gic.auth.entity;
+
+import java.util.Date;
+
+/**
+ * 管理员转移数据记录
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:47 PM

+ */
+public class TabGicUserMove {
+    /**
+     * id
+     */
+    private Integer userMoveId;
+
+    /**
+     * 转移前的用户ID
+     */
+    private Integer fromUserId;
+
+    /**
+     * 转移后的用户ID
+     */
+    private Integer toUserId;
+
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public Integer getUserMoveId() {
+        return userMoveId;
+    }
+
+    public TabGicUserMove setUserMoveId(Integer userMoveId) {
+        this.userMoveId = userMoveId;
+        return this;
+    }
+
+    public Integer getFromUserId() {
+        return fromUserId;
+    }
+
+    public TabGicUserMove setFromUserId(Integer fromUserId) {
+        this.fromUserId = fromUserId;
+        return this;
+    }
+
+    public Integer getToUserId() {
+        return toUserId;
+    }
+
+    public TabGicUserMove setToUserId(Integer toUserId) {
+        this.toUserId = toUserId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabGicUserMove setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabGicUserMove setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabGicUserMove setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabUserDataShow.java

+package com.gic.auth.entity;
+
+import java.util.Date;
+
+/**
+ * 管理员数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:47 PM

+ */
+public class TabUserDataShow {
+    /**
+     * id
+     */
+    private Integer userDataId;
+
+    /**
+     * 管理员数据业务方 1:用户分组 2:卡券
+     */
+    private Integer userDataSceneType;
+
+    /**
+     * 管理员创建的业务ID
+     */
+    private String userDataBusinessId;
+
+    /**
+     * 管理员创建的业务名称
+     */
+    private String userDataBusinessName;
+
+    /**
+     * 管理员ID
+     */
+    private Integer userId;
+
+    /**
+     * 商户ID
+     */
+    private Integer enterpriseId;
+
+    /**
+     * 0:正常 1:删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public Integer getUserDataId() {
+        return userDataId;
+    }
+
+    public TabUserDataShow setUserDataId(Integer userDataId) {
+        this.userDataId = userDataId;
+        return this;
+    }
+
+    public Integer getUserDataSceneType() {
+        return userDataSceneType;
+    }
+
+    public TabUserDataShow setUserDataSceneType(Integer userDataSceneType) {
+        this.userDataSceneType = userDataSceneType;
+        return this;
+    }
+
+    public String getUserDataBusinessId() {
+        return userDataBusinessId;
+    }
+
+    public TabUserDataShow setUserDataBusinessId(String userDataBusinessId) {
+        this.userDataBusinessId = userDataBusinessId;
+        return this;
+    }
+
+    public String getUserDataBusinessName() {
+        return userDataBusinessName;
+    }
+
+    public TabUserDataShow setUserDataBusinessName(String userDataBusinessName) {
+        this.userDataBusinessName = userDataBusinessName;
+        return this;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public TabUserDataShow setUserId(Integer userId) {
+        this.userId = userId;
+        return this;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public TabUserDataShow setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+        return this;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public TabUserDataShow setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+        return this;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public TabUserDataShow setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        return this;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public TabUserDataShow setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        return this;
+    }
+}
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserDataShowService.java

+package com.gic.auth.service;
+
+import com.gic.auth.dto.UserDataShowSaveDTO;
+
+/**
+ * 管理员数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:17 PM

+ */
+public interface UserDataShowService {
+    /**
+     * 新增
+     * @param data
+     */
+    void saveUserData(UserDataShowSaveDTO data);
+
+    /**
+     * 编辑名称
+     * @param userDataBusinessId
+     * @param userDataBusinessName
+     * @param userDataSceneType 业务方 枚举 ManagerDataEnum
+     */
+    void editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType);
+
+    /**
+     * 删除
+     * @param userDataBusinessId
+     * @param userDataSceneType 业务方 枚举 ManagerDataEnum
+     */
+    void deleteUserData(String userDataBusinessId, Integer userDataSceneType);
+}

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserMoveService.java

+package com.gic.auth.service;
+
+import com.gic.auth.entity.TabGicUserMove;
+
+import java.util.List;
+
+/**
+ * 管理员转移表
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 10:22 AM

+ */
+public interface UserMoveService {
+
+    /**
+     * 转移记录
+     * @param record
+     */
+    void saveUserMove(TabGicUserMove record);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userId
+     * @return
+     */
+    List<Integer> listTransferUserId(Integer userId);
+
+    /**
+     * 查询fromUserId列表，如果为空，说明没有数据转移过给userId
+     * @param userIdList
+     * @return
+     */
+    List<Integer> listTransferUserId(List<Integer> userIdList);
+
+}

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserResourceService.java

@@ -66,4 +66,12 @@ public interface UserResourceService {
      * @return  java.util.List<com.gic.auth.entity.TabSysUserRole>

     
 */
     List<UserResourceDTO> listUserResourceByUserId(Integer userId);
+
+    /**
+     * 查询包含资源组数据的user_id
+     * @param resourceIdList
+     * @param enterpriseId
+     * @return
+     */
+    List<Integer> listUserId(List<Integer> resourceIdList, Integer enterpriseId);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserRoleService.java

@@ -53,4 +53,12 @@ public interface UserRoleService {
      * @return  java.util.List<com.gic.auth.entity.TabSysUserRole>

     
 */
     List<TabSysUserRole> listUserRoleByRoleId(Integer roleId);
+
+    /**
+     * 查询包含权限集数据的user_id
+     * @param roleIdList
+     * @param enterpriseId
+     * @return
+     */
+    List<Integer> listUserId(List<Integer> roleIdList, Integer enterpriseId);
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/UserService.java

@@ -132,6 +132,13 @@ public interface UserService {
     Page<UserListDTO> pageUser(UserListQO params);
 
     /**
+     * 符合转移对象的管理员列表
+     * @param params
+     * @return
+     */
+    Page<TabSysUser> pageUserForTransfer(UserListQO params);
+
+    /**
      * 管理员列表
      * @Title: listUser
      * @Description:

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserDataShowServiceImpl.java

+package com.gic.auth.service.impl;
+
+import com.gic.auth.constant.DeleteFlagConstants;
+import com.gic.auth.dao.mapper.TabUserDataShowMapper;
+import com.gic.auth.dto.UserDataShowSaveDTO;
+import com.gic.auth.entity.TabUserDataShow;
+import com.gic.auth.service.UserDataShowService;
+import com.gic.commons.util.EntityUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+
+/**
+ * 管理员数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:19 PM

+ */
+public class UserDataShowServiceImpl implements UserDataShowService{
+    @Autowired
+    private TabUserDataShowMapper tabUserDataShowMapper;
+
+    @Override
+    public void saveUserData(UserDataShowSaveDTO data) {
+        TabUserDataShow record = EntityUtil.changeEntityNew(TabUserDataShow.class, data);
+        record.setCreateTime(new Date());
+        record.setUpdateTime(new Date());
+        record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
+        tabUserDataShowMapper.insert(record);
+    }
+
+    @Override
+    public void editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType) {
+        tabUserDataShowMapper.editUserDataBusinessName(userDataBusinessId, userDataBusinessName, userDataSceneType);
+    }
+
+    @Override
+    public void deleteUserData(String userDataBusinessId, Integer userDataSceneType) {
+        tabUserDataShowMapper.deleteUserData(userDataBusinessId, userDataSceneType);
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserMoveServiceImpl.java

+package com.gic.auth.service.impl;
+
+import com.gic.auth.dao.mapper.UserMoveMapper;
+import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.service.UserMoveService;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+/**
+ * 管理员数据转移
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:48 PM

+ */
+@Service("userMoveService")
+public class UserMoveServiceImpl implements UserMoveService{
+    @Autowired
+    private UserMoveMapper userMoveMapper;
+
+    @Override
+    public void saveUserMove(TabGicUserMove record) {
+        record.setCreateTime(new Date()).setUpdateTime(new Date());
+        userMoveMapper.insert(record);
+    }
+
+    @Override
+    public List<Integer> listTransferUserId(Integer userId) {
+        return userMoveMapper.listTransferUserId(userId);
+    }
+
+    @Override
+    public List<Integer> listTransferUserId(List<Integer> userIdList) {
+        if (CollectionUtils.isEmpty(userIdList)) {
+            return Collections.emptyList();
+        }
+        return userMoveMapper.listTransferUserIdByUserIdList(userIdList);
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserResourceServiceImpl.java

@@ -65,4 +65,9 @@ public class UserResourceServiceImpl implements UserResourceService {
         }
         return new ArrayList<>();
     }
+
+    @Override
+    public List<Integer> listUserId(List<Integer> resourceIdList, Integer enterpriseId) {
+        return tabSysUserResourceMapper.listUserId(resourceIdList, enterpriseId);
+    }
 }
\ No newline at end of file

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserRoleServiceImpl.java

@@ -51,4 +51,9 @@ public class UserRoleServiceImpl implements UserRoleService{
         }
         return new ArrayList<>();
     }
+
+    @Override
+    public List<Integer> listUserId(List<Integer> roleIdList, Integer enterpriseId) {
+        return tabSysUserRoleMapper.listUserId(roleIdList, enterpriseId);
+    }
 }

gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserServiceImpl.java

@@ -121,6 +121,13 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
+    public Page<TabSysUser> pageUserForTransfer(UserListQO params) {
+        PageHelper.startPage(params.getCurrentPage(), params.getPageSize());
+        List<TabSysUser> list = tabSysUserMapper.pageUserForTransfer(params);
+        return (Page<TabSysUser>) list;
+    }
+
+    @Override
     public List<UserListDTO> listUser(UserListQO params) {
         return tabSysUserMapper.listUser(params);
     }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -805,14 +805,14 @@ public class MenuApiServiceImpl implements MenuApiService {
     public ServiceResponse<Void> switchGicMenuToApp(String gicMenuCode, String appMenuCode) {
         TabSysMenu gicMenu = menuService.getMenuByMenuCode(gicMenuCode);
         boolean isNotGicMenu = gicMenu == null || gicMenu.getLevel() != 1 || !gicMenu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT)
-                 || gicMenu.getPlatformType() != MenuPlatformTypeEnum.GIC.getCode();
+                 || !gicMenu.getPlatformType().equals(MenuPlatformTypeEnum.GIC.getCode());
         if (isNotGicMenu) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是GIC对应的code");
         }
 
         TabSysMenu appMenu = menuService.getMenuByMenuCode(appMenuCode);
         boolean isNotAppMenu = appMenu == null || appMenu.getLevel() != 1 || appMenu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT)
-                || gicMenu.getPlatformType() != MenuPlatformTypeEnum.GIC.getCode();
+                || !gicMenu.getPlatformType().equals(MenuPlatformTypeEnum.GIC.getCode());
         if (isNotAppMenu) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是应用对应的code");
         }
@@ -848,14 +848,14 @@ public class MenuApiServiceImpl implements MenuApiService {
     public ServiceResponse<Void> switchAppMenuToGic(String gicMenuCode, String appMenuCode) {
         TabSysMenu appMenu = menuService.getMenuByMenuCode(appMenuCode);
         boolean isNotAppMenu = appMenu == null || appMenu.getLevel() != 1 || appMenu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT)
-                || appMenu.getPlatformType() != MenuPlatformTypeEnum.GIC.getCode();
+                || !appMenu.getPlatformType().equals(MenuPlatformTypeEnum.GIC.getCode());
         if (isNotAppMenu) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是应用对应的code");
         }
 
         TabSysMenu gicMenu = menuService.getMenuByMenuCode(gicMenuCode);
         boolean isNotGicMenu = gicMenu == null || gicMenu.getLevel() != 1 || !gicMenu.getProject().equals(MenuProjectConstants.DEFAULT_PROJECT)
-                || gicMenu.getPlatformType() != MenuPlatformTypeEnum.GIC.getCode();
+                || !gicMenu.getPlatformType().equals(MenuPlatformTypeEnum.GIC.getCode());
         if (isNotGicMenu) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "不存在或者不是gic对应的code");
         }

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java

@@ -2,16 +2,14 @@ package com.gic.auth.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
-import com.gic.auth.constant.AccountGroupMemberTypeEnum;
-import com.gic.auth.constant.AccountPositionEnum;
-import com.gic.auth.constant.DeleteFlagConstants;
-import com.gic.auth.constant.LoginUserTypeEnum;
+import com.gic.auth.constant.*;
 import com.gic.auth.dto.*;
 import com.gic.auth.entity.*;
 import com.gic.auth.qo.UserListQO;
 import com.gic.auth.service.*;
 import com.gic.auth.utils.ValidSplitUtils;
 import com.gic.auth.utils.qrcode.QrcodeUtils;
+import com.gic.auth.utils.transfer.ManagerDataUtils;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constant.QrcodeTypeEnum;
@@ -565,6 +563,86 @@ public class UserApiServiceImpl implements UserApiService {
         return ServiceResponse.success(Collections.emptyList());
     }
 
+    @Override
+    public ServiceResponse<List<Integer>> listManagerDataScene(Integer userId) {
+        List<Integer> result = new ArrayList<>();
+        Integer pageNum = 1;
+        Integer pageSize = 1;
+
+        Page<UserManagerDataDTO> page;
+        for (ManagerDataEnum managerDataEnum : ManagerDataEnum.values()) {
+            page = ManagerDataUtils.queryData(managerDataEnum.getCode(), userId, pageNum, pageSize);
+            boolean hasData = page != null && CollectionUtils.isNotEmpty(page.getResult());
+            if (hasData) {
+                result.add(managerDataEnum.getCode());
+            }
+        }
+        return ServiceResponse.success(result);
+    }
+
+    @Override
+    public ServiceResponse<Page<UserManagerDataDTO>> queryUserManagerData(Integer dataScene, Integer userId,
+                                                                          Integer pageNum, Integer pageSize) {
+        return ServiceResponse.success(ManagerDataUtils.queryData(dataScene, userId, pageNum, pageSize));
+    }
+
+    @Override
+    public ServiceResponse<Page<UserDTO>> queryUserTransferObject(Integer userId, String search,
+                                                                  Integer pageNum, Integer pageSize) {
+        TabSysUser tabUser = userService.getUserById(userId);
+        if (tabUser == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户ID输入有误，无此数据");
+        }
+        //前置条件 权限集和资源组大于等于的管理员（包括超管）
+        //角色集
+        List<UserRoleDTO> userRoleDTOList = userRoleService.listUserRoleByUserId(userId);
+        List<Integer> roleIdList = new ArrayList<>();
+        for (UserRoleDTO userRoleDTO : userRoleDTOList) {
+            roleIdList.add(userRoleDTO.getRoleId());
+        }
+        //权限集大于等于的管理员
+        List<Integer> userIdListByRole = userRoleService.listUserId(roleIdList, tabUser.getEnterpriseId());
+
+        List<Integer> resourceIdList = new ArrayList<>();
+        List<UserResourceDTO> userResourceDTOList = userResourceService.listUserResourceByUserId(userId);
+        for (UserResourceDTO userResourceDTO : userResourceDTOList) {
+            resourceIdList.add(userResourceDTO.getResourceId());
+        }
+        //资源组大于等于的管理员
+        List<Integer> userIdListByResource = userResourceService.listUserId(resourceIdList, tabUser.getEnterpriseId());
+
+        //取交集，因为是并且关系
+        userIdListByRole.retainAll(userIdListByResource);
+
+        TabSysUser admin = userService.getUserByEnterpriseId(tabUser.getEnterpriseId());
+
+        if (CollectionUtils.isEmpty(userIdListByRole)) {
+            //只有超管
+            Page<UserDTO> tempPage = new Page<>();
+            List<UserDTO> tempList = new ArrayList<>(1);
+            tempList.add(EntityUtil.changeEntityNew(UserDTO.class, admin));
+            tempPage.setResult(tempList);
+            tempPage.setTotalCount(1);
+            return ServiceResponse.success(tempPage);
+        }
+
+        UserListQO params = new UserListQO();
+        params.setUserIdList(userIdListByRole);
+        params.setSearch(search);
+        params.setCurrentPage(pageNum);
+        params.setPageSize(pageSize);
+
+        com.github.pagehelper.Page page = userService.pageUserForTransfer(params);
+        Page<UserDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
+        //第一页加上超管数据
+        if (pageNum == null || pageNum == 1) {
+            List<UserDTO> temp = resultPage.getResult();
+            temp.add(0, EntityUtil.changeEntityNew(UserDTO.class, admin));
+        }
+
+        return ServiceResponse.success(resultPage);
+    }
+
     /**
      * 保存关联数据，角色关联、资源关联
      * @Title: saveRole


gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserDataShowApiServiceImpl.java

+package com.gic.auth.service.outer.impl;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.dto.UserDataShowSaveDTO;
+import com.gic.auth.service.UserDataShowApiService;
+import org.springframework.stereotype.Service;
+/**
+ * 管理员数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:50 PM

+ */
+@Service("userDataShowApiService")
+public class UserDataShowApiServiceImpl implements UserDataShowApiService{
+    @Override
+    public ServiceResponse<Void> saveUserData(UserDataShowSaveDTO data) {
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> editUserDataBusinessName(String userDataBusinessId, String userDataBusinessName, Integer userDataSceneType) {
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<Void> deleteUserData(String userDataBusinessId, Integer userDataSceneType) {
+        return ServiceResponse.success();
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserMoveApiServiceImpl.java

+package com.gic.auth.service.outer.impl;
+
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.entity.TabGicUserMove;
+import com.gic.auth.service.UserMoveApiService;
+import com.gic.auth.service.UserMoveService;
+/**
+ * 管理员数据转移
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/7 2:50 PM

+ */
+@Service("UserMoveApiService")
+public class UserMoveApiServiceImpl implements UserMoveApiService{
+    @Autowired
+    private UserMoveService userMoveService;
+
+    @Override
+    public ServiceResponse<Void> saveUserMove(Integer enterpriseId, Integer fromUserId, Integer toUserId) {
+        //查询出转移过fromUserId的数据，用于一起转嫁到toUserId
+        List<Integer> fromUserIdList = userMoveService.listTransferUserId(fromUserId);
+
+        TabGicUserMove record = new TabGicUserMove()
+                .setEnterpriseId(enterpriseId)
+                .setFromUserId(fromUserId)
+                .setToUserId(toUserId);
+        userMoveService.saveUserMove(record);
+        //转嫁
+        if (CollectionUtils.isNotEmpty(fromUserIdList)) {
+            fromUserIdList.forEach(e -> {
+                userMoveService.saveUserMove(new TabGicUserMove()
+                        .setToUserId(toUserId)
+                        .setEnterpriseId(enterpriseId)
+                        .setFromUserId(e)
+                );
+            });
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<List<Integer>> listTransferUserId(Integer userId) {
+        return ServiceResponse.success(userMoveService.listTransferUserId(userId));
+    }
+
+    @Override
+    public ServiceResponse<List<Integer>> listTransferUserId(List<Integer> userIdList) {
+        return ServiceResponse.success(userMoveService.listTransferUserId(userIdList));
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/utils/qrcode/QrcodeUtils.java

@@ -38,9 +38,9 @@ public class QrcodeUtils {
             ServiceResponse<QrcodeDTO> qrCodeResponse = qrCodeApiService.getQrcodeDownload(Integer.parseInt(qrCodeParam));
             if (qrCodeResponse.isSuccess()) {
                 QrcodeDTO qrcodeDTO = qrCodeResponse.getResult();
-                if (QrcodeTypeEnum.AUDITOR.getCode() == qrcodeDTO.getQrCodeType()) {
+                if (QrcodeTypeEnum.AUDITOR.getCode().equals(qrcodeDTO.getQrCodeType())) {
                     ApplicationContextUtils.getBean(AuditorQrcode.class).receiveOpenId(qrcodeDTO.getCustomParams(), openid);
-                } else if (QrcodeTypeEnum.USER.getCode() == qrcodeDTO.getQrCodeType()) {
+                } else if (QrcodeTypeEnum.USER.getCode().equals(qrcodeDTO.getQrCodeType())) {
                     ApplicationContextUtils.getBean(UserQrcode.class).receiveOpenId(qrcodeDTO.getCustomParams(), openid);
                 }
             }
@@ -50,7 +50,7 @@ public class QrcodeUtils {
     /**
      * 获取二维码url
      * @param qrCodeType
-     * @param serviceId
+     * @param serviceId 业务方的主键ID
      * @param enterpriseId
      * @return
      */

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/CouponData.java

+package com.gic.auth.utils.transfer;
+
+import org.springframework.stereotype.Component;
+
+import com.gic.api.base.commons.Page;
+import com.gic.auth.dto.UserManagerDataDTO;
+/**
+ * 卡券数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:51 PM

+ */
+@Component
+public class CouponData implements IManagerData{
+
+    @Override
+    public Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
+        //todo
+        return null;
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/CustomGroupData.java

+package com.gic.auth.utils.transfer;
+
+import org.springframework.stereotype.Component;
+
+import com.gic.api.base.commons.Page;
+import com.gic.auth.dto.UserManagerDataDTO;
+
+/**
+ * 用户分组数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:49 PM

+ */
+@Component
+public class CustomGroupData implements IManagerData{
+
+    @Override
+    public Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize) {
+        //todo
+        return null;
+    }
+}

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/IManagerData.java

+package com.gic.auth.utils.transfer;
+
+import com.gic.api.base.commons.Page;
+import com.gic.auth.dto.UserManagerDataDTO;
+
+/**
+ * 管理员创建的数据
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:39 PM

+ */
+public interface IManagerData {
+
+    /**
+     * 从业务方查询管理员场景的数据.用户分组/卡券....
+     * @param userId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    Page<UserManagerDataDTO> queryData(Integer userId, Integer pageNum, Integer pageSize);
+}

gic-platform-auth-service/src/main/java/com/gic/auth/utils/transfer/ManagerDataUtils.java

+package com.gic.auth.utils.transfer;
+
+import com.gic.api.base.commons.Page;
+import com.gic.auth.constant.ManagerDataEnum;
+import com.gic.auth.dto.UserManagerDataDTO;
+import com.gic.auth.utils.ApplicationContextUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 管理员数据工具
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/1/6 1:53 PM

+ */
+public class ManagerDataUtils {
+
+    private static Map<Integer, IManagerData> map = new HashMap<>(8);
+
+    static {
+        map.put(ManagerDataEnum.CUSTOM_GROUP.getCode(), ApplicationContextUtils.getBean(CustomGroupData.class));
+        map.put(ManagerDataEnum.COUPON.getCode(), ApplicationContextUtils.getBean(CouponData.class));
+    }
+
+    /**
+     * 查询管理员创建的数据
+     * @param dataType 场景类型
+     * @param userId 管理员ID
+     * @return
+     */
+    public static Page<UserManagerDataDTO> queryData(Integer dataType, Integer userId, Integer pageNum, Integer pageSize) {
+        return map.get(dataType).queryData(userId, pageNum, pageSize);
+    }
+}

gic-platform-auth-service/src/main/resources/mapper/TabSysUserMapper.xml

@@ -340,6 +340,28 @@
   </select>
 
 
+  <select id="pageUserForTransfer" resultMap="BaseResultMap" parameterType="com.gic.auth.qo.UserListQO">
+    SELECT <include refid="Base_Column_List"></include>
+    from tab_sys_user
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and login_type = 0
+    <if test="search != null and search != '' ">
+      and ( user_name like concat('%', #{search}, '%') or phone_number like concat('%', #{search}, '%') )
+    </if>
+    <if test="accountType != null">
+      and account_type = #{accountType}
+    </if>
+    <if test="userIdList != null and userIdList.size() > 0">
+      and user_id in
+      <foreach collection="userIdList" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    GROUP BY user_id
+
+    order by create_time desc
+  </select>
+
 
   <update id="deleteById">
     update tab_sys_user set delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}

gic-platform-auth-service/src/main/resources/mapper/TabSysUserResourceMapper.xml

@@ -151,4 +151,15 @@
     where user_id = #{userId}
     and delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
   </select>
+
+  <select id="listUserId" resultType="int">
+    select user_id from tab_sys_user_resource where ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and enterprise_id = #{enterpriseId}
+    and resource_id in
+    <foreach collection="resourceIdList" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+
+    group by user_id having(count(*)) = ${resourceIdList.size}
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-service/src/main/resources/mapper/TabSysUserRoleMapper.xml

@@ -134,4 +134,17 @@
     where role_id = #{roleId}
     and delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
   </select>
+
+  <select id="listUserId" resultType="int">
+    select user_id from tab_sys_user_role
+
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and enterprise_id = #{enterpriseId}
+    and role_id in
+    <foreach collection="roleIdList" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+
+    group by user_id having(count(*)) = ${roleIdList.size}
+  </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-service/src/main/resources/mapper/TabUserDataShowMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.auth.dao.mapper.TabUserDataShowMapper">
+  <resultMap id="BaseResultMap" type="com.gic.auth.entity.TabUserDataShow">
+    <id column="user_data_id" jdbcType="INTEGER" property="userDataId" />
+    <result column="user_data_scene_type" jdbcType="INTEGER" property="userDataSceneType" />
+    <result column="user_data_business_id" jdbcType="VARCHAR" property="userDataBusinessId" />
+    <result column="user_data_business_name" jdbcType="VARCHAR" property="userDataBusinessName" />
+    <result column="user_id" jdbcType="INTEGER" property="userId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    user_data_id, user_data_scene_type, user_data_business_id, user_data_business_name, 
+    user_id, enterprise_id, delete_flag, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_user_data_show
+    where user_data_id = #{userDataId,jdbcType=INTEGER}
+  </select>
+  <insert id="insert" parameterType="com.gic.auth.entity.TabUserDataShow">
+    insert into tab_user_data_show (user_data_id, user_data_scene_type, user_data_business_id, 
+      user_data_business_name, user_id, enterprise_id, 
+      delete_flag, create_time, update_time
+      )
+    values (#{userDataId,jdbcType=INTEGER}, #{userDataSceneType,jdbcType=INTEGER}, #{userDataBusinessId,jdbcType=VARCHAR}, 
+      #{userDataBusinessName,jdbcType=VARCHAR}, #{userId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
+      #{deleteFlag,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.auth.entity.TabUserDataShow">
+    insert into tab_user_data_show
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="userDataId != null">
+        user_data_id,
+      </if>
+      <if test="userDataSceneType != null">
+        user_data_scene_type,
+      </if>
+      <if test="userDataBusinessId != null">
+        user_data_business_id,
+      </if>
+      <if test="userDataBusinessName != null">
+        user_data_business_name,
+      </if>
+      <if test="userId != null">
+        user_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="userDataId != null">
+        #{userDataId,jdbcType=INTEGER},
+      </if>
+      <if test="userDataSceneType != null">
+        #{userDataSceneType,jdbcType=INTEGER},
+      </if>
+      <if test="userDataBusinessId != null">
+        #{userDataBusinessId,jdbcType=VARCHAR},
+      </if>
+      <if test="userDataBusinessName != null">
+        #{userDataBusinessName,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="deleteFlag != null">
+        #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabUserDataShow">
+    update tab_user_data_show
+    <set>
+      <if test="userDataSceneType != null">
+        user_data_scene_type = #{userDataSceneType,jdbcType=INTEGER},
+      </if>
+      <if test="userDataBusinessId != null">
+        user_data_business_id = #{userDataBusinessId,jdbcType=VARCHAR},
+      </if>
+      <if test="userDataBusinessName != null">
+        user_data_business_name = #{userDataBusinessName,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="deleteFlag != null">
+        delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where user_data_id = #{userDataId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabUserDataShow">
+    update tab_user_data_show
+    set user_data_scene_type = #{userDataSceneType,jdbcType=INTEGER},
+      user_data_business_id = #{userDataBusinessId,jdbcType=VARCHAR},
+      user_data_business_name = #{userDataBusinessName,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=INTEGER},
+      enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where user_data_id = #{userDataId,jdbcType=INTEGER}
+  </update>
+
+  <update id="editUserDataBusinessName">
+    update tab_user_data_show set user_data_business_name = #{userDataBusinessName}
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_data_scene_type = #{userDataSceneType}
+    and user_data_business_id = #{userDataBusinessId}
+  </update>
+
+  <update id="deleteUserData">
+    update tab_user_data_show set delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@DELETE_STATUS}
+    where delete_flag = ${@com.gic.auth.constant.DeleteFlagConstants@NORMAL_STATUS}
+    and user_data_scene_type = #{userDataSceneType}
+    and user_data_business_id = #{userDataBusinessId}
+  </update>
+</mapper>
\ No newline at end of file

gic-platform-auth-service/src/main/resources/mapper/UserMoveMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.gic.auth.dao.mapper.UserMoveMapper">
+  <resultMap id="BaseResultMap" type="com.gic.auth.entity.TabGicUserMove">
+    <id column="user_move_id" jdbcType="INTEGER" property="userMoveId" />
+    <result column="from_user_id" jdbcType="INTEGER" property="fromUserId" />
+    <result column="to_user_id" jdbcType="INTEGER" property="toUserId" />
+    <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    user_move_id, from_user_id, to_user_id, enterprise_id, create_time, update_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from tab_gic_user_move
+    where user_move_id = #{userMoveId,jdbcType=INTEGER}
+  </select>
+  <insert id="insert" parameterType="com.gic.auth.entity.TabGicUserMove">
+    insert into tab_gic_user_move (user_move_id, from_user_id, to_user_id, 
+      enterprise_id, create_time, update_time
+      )
+    values (#{userMoveId,jdbcType=INTEGER}, #{fromUserId,jdbcType=INTEGER}, #{toUserId,jdbcType=INTEGER}, 
+      #{enterpriseId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.gic.auth.entity.TabGicUserMove">
+    insert into tab_gic_user_move
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="userMoveId != null">
+        user_move_id,
+      </if>
+      <if test="fromUserId != null">
+        from_user_id,
+      </if>
+      <if test="toUserId != null">
+        to_user_id,
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="userMoveId != null">
+        #{userMoveId,jdbcType=INTEGER},
+      </if>
+      <if test="fromUserId != null">
+        #{fromUserId,jdbcType=INTEGER},
+      </if>
+      <if test="toUserId != null">
+        #{toUserId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.gic.auth.entity.TabGicUserMove">
+    update tab_gic_user_move
+    <set>
+      <if test="fromUserId != null">
+        from_user_id = #{fromUserId,jdbcType=INTEGER},
+      </if>
+      <if test="toUserId != null">
+        to_user_id = #{toUserId,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseId != null">
+        enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where user_move_id = #{userMoveId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.gic.auth.entity.TabGicUserMove">
+    update tab_gic_user_move
+    set from_user_id = #{fromUserId,jdbcType=INTEGER},
+      to_user_id = #{toUserId,jdbcType=INTEGER},
+      enterprise_id = #{enterpriseId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where user_move_id = #{userMoveId,jdbcType=INTEGER}
+  </update>
+
+  <select id="listTransferUserId" resultType="int">
+    select from_user_id from tab_gic_user_move
+    where to_user_id = #{userId}
+  </select>
+
+  <select id="listTransferUserIdByUserIdList" resultType="int">
+    select from_user_id from tab_gic_user_move
+    where to_user_id in
+    <foreach collection="userIdList" index="index" item="item" open="(" separator="," close=")">
+      #{item}
+    </foreach>
+  </select>
+</mapper>
\ No newline at end of file