增加企业分组接口，企业绑定分组关系接口

pom.xml

@@ -89,8 +89,30 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-redis</artifactId>
     </dependency>
+    <dependency> <!-- 开启二级缓存 -->
+      <groupId>org.mybatis.caches</groupId>
+      <artifactId>mybatis-ehcache</artifactId>
+      <version>1.1.0</version>
+    </dependency>
   </dependencies>
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory><!--所在的目录-->
+        <includes><!--包括目录下的.properties,.xml文件都会扫描到-->
+          <include>**/*.xml</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory><!--所在的目录-->
+        <includes><!--包括目录下的.properties,.xml文件都会扫描到-->
+          <include>**/*.xml</include>
+          <include>**/*.properties</include>
+        </includes>
+        <filtering>false</filtering>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -176,4 +198,7 @@
         </plugin>
     </plugins>
   </build>
+
+
+
 </project>

src/main/java/com/mokamrp/privates/controller/WorkContactController.java → src/main/java/com/mokamrp/privates/controller/GroupController.java

@@ -3,8 +3,8 @@ package com.mokamrp.privates.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.mokamrp.privates.service.WorkContactService;
-import com.mokamrp.privates.mapper.pojo.WorkContact;
+import com.mokamrp.privates.service.GroupService;
+import com.mokamrp.privates.mapper.pojo.Group;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.entity.IndexHandle;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,18 +17,18 @@ import java.util.List;
 
 /**
  * <p>
- * 联系人表（客户列表） 前端控制器
+ * 分组信息表 前端控制器
  * </p>
  *
  * @author leon
- * @since 2021-04-19
+ * @since 2021-04-20
  */
 @RestController
-@RequestMapping("/workContact")
-public class WorkContactController {
+@RequestMapping("/group")
+public class GroupController {
 
     @Autowired
-    public WorkContactService workContactService;
+    public GroupService groupService;
 
     /**
      * 基础查询方法
@@ -37,7 +37,7 @@ public class WorkContactController {
      */
     @PostMapping("/index")
     public Object index(@Valid @RequestBody IndexHandle indexHandle){
-        IndexBaseRes<WorkContact> res = workContactService.base(indexHandle);
+        IndexBaseRes<Group> res = groupService.base(indexHandle);
         return AjaxResult.success("success",res);
     }
 }

src/main/java/com/mokamrp/privates/controller/GroupCorpController.java

@@ -0,0 +1,48 @@
+package com.mokamrp.privates.controller;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.mokamrp.privates.service.GroupCorpService;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业分组绑定关系 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@RestController
+@RequestMapping("/groupCorp")
+public class GroupCorpController {
+
+    @Autowired
+    public GroupCorpService groupCorpService;
+
+    /**
+     * 基础查询方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    @PostMapping("/index")
+    public Object index(@Valid @RequestBody IndexHandle indexHandle){
+        IndexBaseRes<GroupCorp> res = groupCorpService.base(indexHandle);
+        return AjaxResult.success("success",res);
+    }
+
+    @GetMapping("/getGroupCorp")
+    public Object getGroupCorp(){
+        List<Map<String,Object>> res = groupCorpService.selectGroupCorp();
+        return AjaxResult.success("success",res);
+    }
+}
+

src/main/java/com/mokamrp/privates/controller/WorkEmployeeController.java

@@ -0,0 +1,50 @@
+package com.mokamrp.privates.controller;
+
+
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.mokamrp.privates.service.WorkEmployeeService;
+import com.mokamrp.privates.mapper.pojo.WorkEmployee;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 企业通讯录 前端控制器
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@RestController
+@RequestMapping("/workEmployee")
+public class WorkEmployeeController {
+
+    @Autowired
+    public WorkEmployeeService workEmployeeService;
+
+    /**
+     * 基础查询方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    @PostMapping("/index")
+    public Object index(@Valid @RequestBody IndexHandle indexHandle){
+        IndexBaseRes<WorkEmployee> res = workEmployeeService.base(indexHandle);
+        return AjaxResult.success("success",res);
+    }
+
+    @GetMapping("/getUserEmployee")
+    public void getUserEmployee(@AuthUser User authUser){
+
+//        return AjaxResult.success("success",);
+    }
+
+}
+

src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.java

@@ -0,0 +1,27 @@
+package com.mokamrp.privates.mapper;
+
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业分组绑定关系 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@Mapper
+public interface GroupCorpMapper extends BaseMapper<GroupCorp> {
+    /**
+     * 企业分组绑定关系
+     * @return
+     */
+    public List<Map<String,Object>> selectGroupCorp();
+}

src/main/java/com/mokamrp/privates/mapper/GroupCorpMapper.xml

@@ -0,0 +1,22 @@
+<?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.mokamrp.privates.mapper.GroupCorpMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.GroupCorp">
+        <id column="id" property="id" />
+        <result column="group_id" property="groupId" />
+        <result column="corp_id" property="corpId" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, group_id, corp_id, create_at, update_at
+    </sql>
+    <select id="selectGroupCorp" resultType="map">
+        SELECT * FROM private_group_corp AS A
+        LEFT JOIN private_group AS B ON A.group_id = B.id
+    </select>
+</mapper>

src/main/java/com/mokamrp/privates/mapper/GroupMapper.java

@@ -0,0 +1,16 @@
+package com.mokamrp.privates.mapper;
+
+import com.mokamrp.privates.mapper.pojo.Group;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 分组信息表 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+public interface GroupMapper extends BaseMapper<Group> {
+
+}

src/main/java/com/mokamrp/privates/mapper/GroupMapper.xml

@@ -0,0 +1,22 @@
+<?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.mokamrp.privates.mapper.GroupMapper">
+
+    <!-- 开启二级缓存 -->
+    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.Group">
+        <id column="id" property="id" />
+        <result column="group_type" property="groupType" />
+        <result column="group_name" property="groupName" />
+        <result column="create_at" property="createAt" />
+        <result column="update_at" property="updateAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, group_type, group_name, create_at, update_at
+    </sql>
+
+</mapper>

src/main/java/com/mokamrp/privates/mapper/WorkContactMapper.java

@@ -1,16 +0,0 @@
-package com.mokamrp.privates.mapper;
-
-import com.mokamrp.privates.mapper.pojo.WorkContact;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-
-/**
- * <p>
- * 联系人表（客户列表） Mapper 接口
- * </p>
- *
- * @author leon
- * @since 2021-04-19
- */
-public interface WorkContactMapper extends BaseMapper<WorkContact> {
-
-}

src/main/java/com/mokamrp/privates/mapper/WorkContactMapper.xml

@@ -1,35 +0,0 @@
-<?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.mokamrp.privates.mapper.WorkContactMapper">
-
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkContact">
-        <id column="id" property="id" />
-        <result column="corp_id" property="corpId" />
-        <result column="wx_external_userid" property="wxExternalUserid" />
-        <result column="name" property="name" />
-        <result column="nick_name" property="nickName" />
-        <result column="avatar" property="avatar" />
-        <result column="follow_up_status" property="followUpStatus" />
-        <result column="type" property="type" />
-        <result column="gender" property="gender" />
-        <result column="unionid" property="unionid" />
-        <result column="position" property="position" />
-        <result column="corp_name" property="corpName" />
-        <result column="corp_full_name" property="corpFullName" />
-        <result column="external_profile" property="externalProfile" />
-        <result column="business_no" property="businessNo" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-        <result column="deleted_at" property="deletedAt" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, corp_id, wx_external_userid, name, nick_name, avatar, follow_up_status, type, gender, unionid, position, corp_name, corp_full_name, external_profile, business_no, created_at, updated_at, deleted_at
-    </sql>
-
-</mapper>

src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.java

@@ -0,0 +1,16 @@
+package com.mokamrp.privates.mapper;
+
+import com.mokamrp.privates.mapper.pojo.WorkEmployee;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 企业通讯录 Mapper 接口
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+public interface WorkEmployeeMapper extends BaseMapper<WorkEmployee> {
+
+}

src/main/java/com/mokamrp/privates/mapper/WorkEmployeeMapper.xml

@@ -0,0 +1,43 @@
+<?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.mokamrp.privates.mapper.WorkEmployeeMapper">
+
+    <!-- 开启二级缓存 -->
+    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkEmployee">
+        <id column="id" property="id" />
+        <result column="wx_user_id" property="wxUserId" />
+        <result column="corp_id" property="corpId" />
+        <result column="name" property="name" />
+        <result column="mobile" property="mobile" />
+        <result column="position" property="position" />
+        <result column="gender" property="gender" />
+        <result column="email" property="email" />
+        <result column="avatar" property="avatar" />
+        <result column="thumb_avatar" property="thumbAvatar" />
+        <result column="telephone" property="telephone" />
+        <result column="alias" property="alias" />
+        <result column="extattr" property="extattr" />
+        <result column="status" property="status" />
+        <result column="qr_code" property="qrCode" />
+        <result column="external_profile" property="externalProfile" />
+        <result column="external_position" property="externalPosition" />
+        <result column="address" property="address" />
+        <result column="open_user_id" property="openUserId" />
+        <result column="wx_main_department_id" property="wxMainDepartmentId" />
+        <result column="main_department_id" property="mainDepartmentId" />
+        <result column="log_user_id" property="logUserId" />
+        <result column="contact_auth" property="contactAuth" />
+        <result column="created_at" property="createdAt" />
+        <result column="updated_at" property="updatedAt" />
+        <result column="deleted_at" property="deletedAt" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth, created_at, updated_at, deleted_at
+    </sql>
+
+</mapper>

src/main/java/com/mokamrp/privates/mapper/pojo/Group.java

@@ -0,0 +1,100 @@
+package com.mokamrp.privates.mapper.pojo;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 分组信息表
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@TableName("private_group")
+public class Group extends Model<Group> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 1 企业分组 2 管理账户分组
+     */
+    private Integer groupType;
+    /**
+     * 分组名称
+     */
+    private String groupName;
+    /**
+     * 创建时间
+     */
+    private Date createAt;
+    /**
+     * 更新时间
+     */
+    private Date updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Integer groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Date getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(Date createAt) {
+        this.createAt = createAt;
+    }
+
+    public Date getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(Date updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "Group{" +
+        ", id=" + id +
+        ", groupType=" + groupType +
+        ", groupName=" + groupName +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

src/main/java/com/mokamrp/privates/mapper/pojo/GroupCorp.java

@@ -0,0 +1,103 @@
+package com.mokamrp.privates.mapper.pojo;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企业分组绑定关系
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@TableName("private_group_corp")
+public class GroupCorp extends Model<GroupCorp> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 组ID(private.group.id)
+     */
+    private Integer groupId;
+    /**
+     * 企业ID(mc.mc_corp.id)
+     */
+    private Integer corpId;
+    /**
+     * 创建时间
+     */
+    private Date createAt;
+    /**
+     * 更新时间
+     */
+    private Date updateAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+
+    public Integer getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
+    }
+
+    public Date getCreateAt() {
+        return createAt;
+    }
+
+    public void setCreateAt(Date createAt) {
+        this.createAt = createAt;
+    }
+
+    public Date getUpdateAt() {
+        return updateAt;
+    }
+
+    public void setUpdateAt(Date updateAt) {
+        this.updateAt = updateAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupCorp{" +
+        ", id=" + id +
+        ", groupId=" + groupId +
+        ", corpId=" + corpId +
+        ", createAt=" + createAt +
+        ", updateAt=" + updateAt +
+        "}";
+    }
+}

src/main/java/com/mokamrp/privates/mapper/pojo/WorkEmployee.java

@@ -0,0 +1,364 @@
+package com.mokamrp.privates.mapper.pojo;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 企业通讯录
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@TableName("mc_work_employee")
+public class WorkEmployee extends Model<WorkEmployee> {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * wx.userId
+     */
+    private String wxUserId;
+    /**
+     * 所属企业corpid（mc_corp.id）
+     */
+    private Integer corpId;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 职位信息
+     */
+    private String position;
+    /**
+     * 性别。0表示未定义，1表示男性，2表示女性
+     */
+    private Integer gender;
+    /**
+     * 邮箱
+     */
+    private String email;
+    /**
+     * 头像url
+     */
+    private String avatar;
+    /**
+     * 头像缩略图
+     */
+    private String thumbAvatar;
+    /**
+     * 座机
+     */
+    private String telephone;
+    /**
+     * 别名
+     */
+    private String alias;
+    /**
+     * 扩展属性
+     */
+    private String extattr;
+    /**
+     * 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业
+     */
+    private Integer status;
+    /**
+     * 员工二维码
+     */
+    private String qrCode;
+    /**
+     * 员工对外属性
+     */
+    private String externalProfile;
+    /**
+     * 员工对外职位
+     */
+    private String externalPosition;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 全局唯一id
+     */
+    private String openUserId;
+    /**
+     * 微信端主部门ID
+     */
+    private Integer wxMainDepartmentId;
+    /**
+     * 主部门id(mc_work_department.id)
+     */
+    private Integer mainDepartmentId;
+    /**
+     * 子账户ID(mc_user.id)
+     */
+    private Integer logUserId;
+    /**
+     * 是否配置外部联系人权限（1.是 2.否）
+     */
+    private Integer contactAuth;
+    private Date createdAt;
+    private Date updatedAt;
+    private Date deletedAt;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId;
+    }
+
+    public Integer getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(Integer corpId) {
+        this.corpId = corpId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getThumbAvatar() {
+        return thumbAvatar;
+    }
+
+    public void setThumbAvatar(String thumbAvatar) {
+        this.thumbAvatar = thumbAvatar;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getExtattr() {
+        return extattr;
+    }
+
+    public void setExtattr(String extattr) {
+        this.extattr = extattr;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQrCode(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getExternalProfile() {
+        return externalProfile;
+    }
+
+    public void setExternalProfile(String externalProfile) {
+        this.externalProfile = externalProfile;
+    }
+
+    public String getExternalPosition() {
+        return externalPosition;
+    }
+
+    public void setExternalPosition(String externalPosition) {
+        this.externalPosition = externalPosition;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getOpenUserId() {
+        return openUserId;
+    }
+
+    public void setOpenUserId(String openUserId) {
+        this.openUserId = openUserId;
+    }
+
+    public Integer getWxMainDepartmentId() {
+        return wxMainDepartmentId;
+    }
+
+    public void setWxMainDepartmentId(Integer wxMainDepartmentId) {
+        this.wxMainDepartmentId = wxMainDepartmentId;
+    }
+
+    public Integer getMainDepartmentId() {
+        return mainDepartmentId;
+    }
+
+    public void setMainDepartmentId(Integer mainDepartmentId) {
+        this.mainDepartmentId = mainDepartmentId;
+    }
+
+    public Integer getLogUserId() {
+        return logUserId;
+    }
+
+    public void setLogUserId(Integer logUserId) {
+        this.logUserId = logUserId;
+    }
+
+    public Integer getContactAuth() {
+        return contactAuth;
+    }
+
+    public void setContactAuth(Integer contactAuth) {
+        this.contactAuth = contactAuth;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Date getDeletedAt() {
+        return deletedAt;
+    }
+
+    public void setDeletedAt(Date deletedAt) {
+        this.deletedAt = deletedAt;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkEmployee{" +
+        ", id=" + id +
+        ", wxUserId=" + wxUserId +
+        ", corpId=" + corpId +
+        ", name=" + name +
+        ", mobile=" + mobile +
+        ", position=" + position +
+        ", gender=" + gender +
+        ", email=" + email +
+        ", avatar=" + avatar +
+        ", thumbAvatar=" + thumbAvatar +
+        ", telephone=" + telephone +
+        ", alias=" + alias +
+        ", extattr=" + extattr +
+        ", status=" + status +
+        ", qrCode=" + qrCode +
+        ", externalProfile=" + externalProfile +
+        ", externalPosition=" + externalPosition +
+        ", address=" + address +
+        ", openUserId=" + openUserId +
+        ", wxMainDepartmentId=" + wxMainDepartmentId +
+        ", mainDepartmentId=" + mainDepartmentId +
+        ", logUserId=" + logUserId +
+        ", contactAuth=" + contactAuth +
+        ", createdAt=" + createdAt +
+        ", updatedAt=" + updatedAt +
+        ", deletedAt=" + deletedAt +
+        "}";
+    }
+}

src/main/java/com/mokamrp/privates/service/GroupCorpService.java

@@ -0,0 +1,31 @@
+package com.mokamrp.privates.service;
+
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
+import com.baomidou.mybatisplus.service.IService;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业分组绑定关系 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+public interface GroupCorpService extends IService<GroupCorp> {
+    /**
+     * 基础sql操作方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    public IndexBaseRes<GroupCorp> base(IndexHandle indexhandle);
+
+    /**
+     * 查询企业分组绑定关系
+     * @return
+     */
+    public List<Map<String,Object>> selectGroupCorp();
+}

src/main/java/com/mokamrp/privates/service/WorkContactService.java → src/main/java/com/mokamrp/privates/service/GroupService.java

@@ -1,6 +1,6 @@
 package com.mokamrp.privates.service;
 
-import com.mokamrp.privates.mapper.pojo.WorkContact;
+import com.mokamrp.privates.mapper.pojo.Group;
 import com.baomidou.mybatisplus.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
@@ -8,17 +8,17 @@ import java.util.List;
 
 /**
  * <p>
- * 联系人表（客户列表） 服务类
+ * 分组信息表 服务类
  * </p>
  *
  * @author leon
- * @since 2021-04-19
+ * @since 2021-04-20
  */
-public interface WorkContactService extends IService<WorkContact> {
+public interface GroupService extends IService<Group> {
     /**
      * 基础sql操作方法
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
-    public IndexBaseRes<WorkContact> base(IndexHandle indexhandle);
+    public IndexBaseRes<Group> base(IndexHandle indexhandle);
 }

src/main/java/com/mokamrp/privates/service/WorkEmployeeService.java

@@ -0,0 +1,24 @@
+package com.mokamrp.privates.service;
+
+import com.mokamrp.privates.mapper.pojo.WorkEmployee;
+import com.baomidou.mybatisplus.service.IService;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+import java.util.List;
+
+/**
+ * <p>
+ * 企业通讯录 服务类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+public interface WorkEmployeeService extends IService<WorkEmployee> {
+    /**
+     * 基础sql操作方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    public IndexBaseRes<WorkEmployee> base(IndexHandle indexhandle);
+}

src/main/java/com/mokamrp/privates/service/impl/GroupCorpServiceImpl.java

@@ -0,0 +1,87 @@
+package com.mokamrp.privates.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.mokamrp.privates.mapper.pojo.GroupCorp;
+import com.mokamrp.privates.mapper.GroupCorpMapper;
+import com.mokamrp.privates.service.GroupCorpService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业分组绑定关系 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@Service
+public class GroupCorpServiceImpl extends ServiceImpl<GroupCorpMapper, GroupCorp> implements GroupCorpService {
+
+    @Autowired
+    private GroupCorpMapper groupCorpMapper;
+
+    /**
+     * 基础sql操作方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    public IndexBaseRes<GroupCorp> base(IndexHandle indexhandle){
+        Integer total = this.selectCount(new EntityWrapper<GroupCorp>());
+        Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
+        Wrapper<GroupCorp> warpper = new EntityWrapper<GroupCorp>();
+        //.@leon where like,=,<>
+        while (fileterIt.hasNext()){
+            Map.Entry entray = (Map.Entry) fileterIt.next();
+            Object key = entray.getKey();
+            Object value = entray.getValue();
+            Map<String,String> op = indexhandle.getOp();
+            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
+                warpper = warpper.eq(key.toString(),value.toString());
+            }else if (op.get(key).toString().equals("like")){
+                warpper = warpper.like(key.toString(),"%"+value.toString()+"%");
+            }else if (op.get(key).toString().equals("<>")){
+                warpper = warpper.ne(key.toString(),value.toString());
+            }
+        }
+        //.@leon order
+        if (indexhandle.getOrder() != null && indexhandle.getSort() != null){
+            String order = indexhandle.getOrder();
+            String sort = indexhandle.getSort();
+            if (!order.isEmpty() && !sort.isEmpty()){
+                if (order.equals("asc")){
+                    warpper = warpper.orderBy(sort,true);
+                }else if(order.equals("desc")){
+                    warpper = warpper.orderBy(sort,false);
+                }
+            }
+        }
+        //.@leon offset limit
+        Page<GroupCorp> page = this.selectPage(
+            new Page<GroupCorp>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
+        );
+        IndexBaseRes<GroupCorp> result = new IndexBaseRes<GroupCorp>();
+        result.setList(page.getRecords());
+        result.setTotal(total);
+        return result;
+    }
+
+    /**
+     * 查询企业分组绑定关系
+     * @return
+     */
+    @Override
+    public List<Map<String,Object>> selectGroupCorp(){
+        List<Map<String,Object>> res = groupCorpMapper.selectGroupCorp();
+        return res;
+    }
+}

src/main/java/com/mokamrp/privates/service/impl/WorkContactServiceImpl.java → src/main/java/com/mokamrp/privates/service/impl/GroupServiceImpl.java

@@ -3,9 +3,9 @@ package com.mokamrp.privates.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.mokamrp.privates.mapper.pojo.WorkContact;
-import com.mokamrp.privates.mapper.WorkContactMapper;
-import com.mokamrp.privates.service.WorkContactService;
+import com.mokamrp.privates.mapper.pojo.Group;
+import com.mokamrp.privates.mapper.GroupMapper;
+import com.mokamrp.privates.service.GroupService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.IndexHandle;
@@ -16,23 +16,23 @@ import java.util.Map;
 
 /**
  * <p>
- * 联系人表（客户列表） 服务实现类
+ * 分组信息表 服务实现类
  * </p>
  *
  * @author leon
- * @since 2021-04-19
+ * @since 2021-04-20
  */
 @Service
-public class WorkContactServiceImpl extends ServiceImpl<WorkContactMapper, WorkContact> implements WorkContactService {
+public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements GroupService {
     /**
      * 基础sql操作方法
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
      * @since 1949-10-01
      */
-    public IndexBaseRes<WorkContact> base(IndexHandle indexhandle){
-        Integer total = this.selectCount(new EntityWrapper<WorkContact>());
+    public IndexBaseRes<Group> base(IndexHandle indexhandle){
+        Integer total = this.selectCount(new EntityWrapper<Group>());
         Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
-        Wrapper<WorkContact> warpper = new EntityWrapper<WorkContact>();
+        Wrapper<Group> warpper = new EntityWrapper<Group>();
         //.@leon where like,=,<>
         while (fileterIt.hasNext()){
             Map.Entry entray = (Map.Entry) fileterIt.next();
@@ -60,10 +60,10 @@ public class WorkContactServiceImpl extends ServiceImpl<WorkContactMapper, WorkC
             }
         }
         //.@leon offset limit
-        Page<WorkContact> page = this.selectPage(
-            new Page<WorkContact>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
+        Page<Group> page = this.selectPage(
+            new Page<Group>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
         );
-        IndexBaseRes<WorkContact> result = new IndexBaseRes<WorkContact>();
+        IndexBaseRes<Group> result = new IndexBaseRes<Group>();
         result.setList(page.getRecords());
         result.setTotal(total);
         return result;

src/main/java/com/mokamrp/privates/service/impl/WorkEmployeeServiceImpl.java

@@ -0,0 +1,71 @@
+package com.mokamrp.privates.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.mokamrp.privates.mapper.pojo.WorkEmployee;
+import com.mokamrp.privates.mapper.WorkEmployeeMapper;
+import com.mokamrp.privates.service.WorkEmployeeService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.mokamrp.privates.entity.IndexHandle;
+import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * <p>
+ * 企业通讯录 服务实现类
+ * </p>
+ *
+ * @author leon
+ * @since 2021-04-20
+ */
+@Service
+public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, WorkEmployee> implements WorkEmployeeService {
+    /**
+     * 基础sql操作方法
+     * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
+     * @since 1949-10-01
+     */
+    public IndexBaseRes<WorkEmployee> base(IndexHandle indexhandle){
+        Integer total = this.selectCount(new EntityWrapper<WorkEmployee>());
+        Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
+        Wrapper<WorkEmployee> warpper = new EntityWrapper<WorkEmployee>();
+        //.@leon where like,=,<>
+        while (fileterIt.hasNext()){
+            Map.Entry entray = (Map.Entry) fileterIt.next();
+            Object key = entray.getKey();
+            Object value = entray.getValue();
+            Map<String,String> op = indexhandle.getOp();
+            if(op.get(key) == null || op.get(key).isEmpty() || op.get(key).toString().equals("=")){
+                warpper = warpper.eq(key.toString(),value.toString());
+            }else if (op.get(key).toString().equals("like")){
+                warpper = warpper.like(key.toString(),"%"+value.toString()+"%");
+            }else if (op.get(key).toString().equals("<>")){
+                warpper = warpper.ne(key.toString(),value.toString());
+            }
+        }
+        //.@leon order
+        if (indexhandle.getOrder() != null && indexhandle.getSort() != null){
+            String order = indexhandle.getOrder();
+            String sort = indexhandle.getSort();
+            if (!order.isEmpty() && !sort.isEmpty()){
+                if (order.equals("asc")){
+                    warpper = warpper.orderBy(sort,true);
+                }else if(order.equals("desc")){
+                    warpper = warpper.orderBy(sort,false);
+                }
+            }
+        }
+        //.@leon offset limit
+        Page<WorkEmployee> page = this.selectPage(
+            new Page<WorkEmployee>(indexhandle.getOffset(),indexhandle.getLimit()),warpper
+        );
+        IndexBaseRes<WorkEmployee> result = new IndexBaseRes<WorkEmployee>();
+        result.setList(page.getRecords());
+        result.setTotal(total);
+        return result;
+    }
+}

src/test/java/com/mokamrp/AutoMP.java

@@ -49,8 +49,8 @@ public class AutoMP {
 				.setRestControllerStyle(true) //.RestController
 				.setDbColumnUnderline(true)  // 指定表名 字段名是否使用下划线
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
-				.setTablePrefix("mc_") //表名前缀
-				.setInclude("mc_work_contact");  // 生成的表
+				.setTablePrefix("private_") //表名前缀
+				.setInclude("private_group_corp");  // 生成的表
 		
 		//4. 包名策略配置 
 		PackageConfig pkConfig = new PackageConfig();