Merge branch 'master' of http://git.mokasz.com/marketing/moka-private

# Conflicts:
#	src/main/java/com/mokamrp/privates/service/UserCorpService.java
#	src/main/java/com/mokamrp/privates/service/impl/UserCorpServiceImpl.java

pom.xml

@@ -64,7 +64,12 @@
     <dependency>
       <groupId>com.baomidou</groupId>
       <artifactId>mybatis-plus-boot-starter</artifactId>
-      <version>2.3.3</version>
+      <version>3.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>com.baomidou</groupId>
+      <artifactId>mybatis-plus-generator</artifactId>
+      <version>3.4.1</version>
     </dependency>
     <!-- Apache velocity -->
     <dependency>
@@ -75,6 +80,8 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <version>1.18.8</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -213,14 +220,15 @@
           </excludes>
         </configuration>
       </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-                <source>8</source>
-                <target>8</target>
-            </configuration>
-        </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

src/main/java/com/mokamrp/privates/config/Config.java

@@ -25,4 +25,7 @@ public class Config {
 //        fastJsonHttpMessageConverter.setSupportedMediaTypes(supportedMediaTypes);
 //        return fastJsonHttpMessageConverter;
 //    }
+
+
+
 }

src/main/java/com/mokamrp/privates/config/MybatisPlusConfig.java

@@ -0,0 +1,17 @@
+package com.mokamrp.privates.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfig {
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

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

@@ -1,10 +1,9 @@
 package com.mokamrp.privates.controller;
 
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.AddHandle;
@@ -36,9 +35,9 @@ public class BaseController<T> {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        EntityWrapper<T> entityWrapper = new EntityWrapper<>();
-        entityWrapper.in("id", delHandle.getIds());
-        boolean res = service.delete(entityWrapper);
+        QueryWrapper<T> QueryWrapper = new QueryWrapper<>();
+        QueryWrapper.in("id", delHandle.getIds());
+        boolean res = service.remove(QueryWrapper);
         if (!res) {
             return AjaxResult.error("删除失败");
         }
@@ -51,7 +50,7 @@ public class BaseController<T> {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         Date date = new Date();
-        Boolean res = service.insert(addHandle.getRaw());
+        Boolean res = service.save(addHandle.getRaw());
         if (res) {
             return AjaxResult.success(Constants.SUCCESS, res);
         } else {
@@ -64,7 +63,7 @@ public class BaseController<T> {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
-        service.update(editHandle.getRaw(), new EntityWrapper<T>().in("id", editHandle.getIds()));
+        service.update(editHandle.getRaw(), new QueryWrapper<T>().in("id", editHandle.getIds()));
         return AjaxResult.success(Constants.SUCCESS, true);
     }
 
@@ -73,7 +72,7 @@ public class BaseController<T> {
         if (ids == null || ids.isEmpty()){
             return AjaxResult.error("ids null");
         }
-        T res = service.selectOne(new EntityWrapper<T>().eq("id",ids));
+        T res = service.getOne(new QueryWrapper<T>().eq("id",ids));
         return AjaxResult.success(Constants.SUCCESS, res);
     }
 
@@ -83,7 +82,7 @@ public class BaseController<T> {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         Iterator<Map.Entry<String, String>> filterIt = indexHandle.getFilter().entrySet().iterator();
-        Wrapper<T> wrapper = new EntityWrapper<T>();
+        QueryWrapper<T> wrapper = new QueryWrapper<T>();
         //.@leon where like,=,<>
         while (filterIt.hasNext()) {
             Map.Entry<String, String> entry = filterIt.next();
@@ -100,6 +99,14 @@ public class BaseController<T> {
                 case "=":
                     wrapper = wrapper.eq(columnName, value);
                     break;
+                case "RANGE":
+                    String[] strArr = value.split(" - ");
+                    if(strArr.length <=1){
+                        break;
+                    }
+                    wrapper = wrapper.le(columnName, strArr[1]);
+                    wrapper = wrapper.ge(columnName, strArr[0]);
+                    break;
                 case "LIKE":
                     wrapper = wrapper.like(columnName, "%" + value + "%");
                     break;
@@ -112,22 +119,22 @@ public class BaseController<T> {
             }
         }
         //.统计数量
-        Integer total = service.selectCount(wrapper);
+        Integer total = service.count(wrapper);
         //.@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")) {
-                    wrapper = wrapper.orderBy(sort, true);
+                    wrapper = wrapper.orderByAsc(sort);
                 } else if (order.equals("desc")) {
-                    wrapper = wrapper.orderBy(sort, false);
+                    wrapper = wrapper.orderByDesc(sort);
                 }
             }
         }
 
         //.@leon offset limit
-        Page<T> page = service.selectPage(
+        Page<T> page = service.page(
                 new Page<T>(indexHandle.getOffset(), indexHandle.getLimit()), wrapper
         );
 

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.controller;
 
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.Group;
 import com.mokamrp.privates.service.CorpService;
@@ -53,7 +53,7 @@ public class GroupCorpController extends BaseController<GroupCorp> {
         if (groupId == null || groupId.isEmpty()) {
             return AjaxResult.error("groupId 不可为空");
         }
-        List<GroupCorp> corps = groupCorpService.selectList(new EntityWrapper<GroupCorp>().eq("group_id", groupId));
+        List<GroupCorp> corps = groupCorpService.list(new QueryWrapper<GroupCorp>().eq("group_id", groupId));
         if (corps == null || corps.size() == 0) {
             return AjaxResult.success("success", new ArrayList<>());
         }
@@ -61,7 +61,7 @@ public class GroupCorpController extends BaseController<GroupCorp> {
         for (GroupCorp corp : corps) {
             corpIds.add(corp.getCorpId());
         }
-        List<Corp> corpInfos = corpService.selectList(new EntityWrapper<Corp>().in("id", corpIds));
+        List<Corp> corpInfos = corpService.list(new QueryWrapper<Corp>().in("id", corpIds));
         return AjaxResult.success("success", corpInfos);
     }
 

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

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.controller;
 
 
+import com.mokamrp.privates.mapper.pojo.User;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.stereotype.Controller;
@@ -15,7 +16,7 @@ import org.springframework.stereotype.Controller;
  */
 @Controller
 @RequestMapping("/user")
-public class UserController {
+public class UserController extends BaseController<User>{
 
 }
 

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

@@ -1,7 +1,6 @@
 package com.mokamrp.privates.controller;
 
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.entity.SetUserCorpsHandle;
 import com.mokamrp.privates.help.AjaxResult;

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

@@ -6,12 +6,9 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
-import com.mokamrp.privates.entity.JobRedis;
-import com.mokamrp.privates.entity.JobRoomJobRedis;
-import com.mokamrp.privates.entity.JobWorkContactEmployeeRedis;
+import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Downfile;
@@ -20,6 +17,7 @@ import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.service.DownfileService;
+import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.RedisUtil;
@@ -29,15 +27,14 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.xerces.xs.datatypes.ObjectList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import java.io.ByteArrayInputStream;
 import java.util.*;
 
@@ -57,28 +54,33 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @Autowired
     private WorkContactEmployeeService WorkContactEmployeeService;
 
+    @Autowired
+    public UserCorpService userCorpService;
+
     @Resource
     private RedisUtil redisUtil;
 
     @Autowired
     private DownfileService downfileService;
 
-    @RequestMapping("/list")
+    @PostMapping("/list")
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            Integer gender, Integer status,
-            Integer pagesize, Integer page, String name,
-            Integer start_deleted_at, Integer end_deleted_at,
-            Integer start_created_at, Integer end_created_at,
-            Integer group_id, Integer corp_id, @RequestParam List employee_id, @RequestParam List tag_id, Integer channel_code_id
-    ) {
-
-        Map<String, Object> resMap = WorkContactEmployeeService.getPageList(gender, status,
-                pagesize, page, name,
-                start_deleted_at, end_deleted_at,
-                start_created_at, end_created_at,
-                group_id, corp_id, employee_id, tag_id, channel_code_id);//所有
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+
+        if(corpIds.size() <=0){
+            return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
+        }
+
+        handle.setAuthCorpIds(corpIds);
+        Map<String, Object> resMap = WorkContactEmployeeService.getPageList(handle);//所有
 
         return AjaxResult.success(resMap);
 
@@ -87,32 +89,30 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @RequestMapping("/export")
     @ResponseBody
     public Object export(
-            Integer gender, Integer status,String name,
-            Integer start_deleted_at, Integer end_deleted_at,
-            Integer start_created_at, Integer end_created_at,
-            Integer group_id, Integer corp_id,@RequestParam List employee_id, @RequestParam List tag_id , Integer channel_code_id
-    ){
+            @AuthUser User authUser,
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult){
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        if(corpIds.size() <=0){
+            return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
+        }
+
+        handle.setAuthCorpIds(corpIds);
 
         Downfile downObj = new Downfile();
         downObj.setMsg(Downfile.DEFAULT_MSG);
+        downObj.setAuthId(authUser.getId());
+        downObj.setAuthName(authUser.getName());
         downObj.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
-        downfileService.insert(downObj);
+        downfileService.save(downObj);
 
         /*推送一个简单下载任务*/
         JobRedis realJob = new JobRedis();
         JobWorkContactEmployeeRedis job = new JobWorkContactEmployeeRedis();
-        job.setGender(gender);
-        job.setStatus(status);
-        job.setName(name);
-        job.setStartCreatedAt(start_created_at);
-        job.setEndCreatedAt(end_created_at);
-        job.setStartDeletedAt(start_deleted_at);
-        job.setEndDeletedAt(end_deleted_at);
-        job.setGroupId(group_id);
-        job.setCorpId(corp_id);
-        job.setEmployeeId(employee_id);
-        job.setTagId(tag_id);
-        job.setChannelCodeId(channel_code_id);
+        job.setWorkContactEmployeeHandle(handle);
 
         realJob.setJobWorkContactEmployeeRedis(job);
         realJob.setJobName(JobWorkContactEmployeeRedis.TASK_NAME);

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

@@ -1,8 +1,5 @@
 package com.mokamrp.privates.controller;
 
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.help.AjaxResult;

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

@@ -8,13 +8,15 @@ import com.mokamrp.privates.entity.JobRedis;
 import com.mokamrp.privates.entity.JobRoomJobRedis;
 import com.mokamrp.privates.entity.WorkRoomBandTagHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pojo.Downfile;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
 import com.mokamrp.privates.service.DownfileService;
+import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.mokamrp.privates.service.WorkRoomService;
 import com.mokamrp.privates.utils.RedisUtil;
-import com.sun.xml.internal.bind.v2.runtime.reflect.opt.Const;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.validation.BindingResult;
@@ -45,16 +47,27 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @Autowired
     private DownfileService downfileService;
 
+    @Autowired
+    private UserCorpService userCorpService;
+
     @Resource
     private RedisUtil redisUtil;
 
     @PostMapping("/list")
     @ResponseBody
-    public Object getList(@Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
+    public Object getList(
+            @AuthUser User authUser,
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        if (corpIds.size() <= 0) {
+            return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
+        }
+        handle.setAuthCorpIds(corpIds);
+
         Map<String, Object> resMap = workRoomService.getPageList(handle);//所有
 
         return AjaxResult.success(resMap);
@@ -62,7 +75,18 @@ public class WorkRoomController extends BaseController<WorkRoom> {
 
     @PostMapping("/export")
     @ResponseBody
-    public Object export(@Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
+    public Object export(
+            @AuthUser User authUser,
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId());
+        if (corpIds.size() <= 0) {
+            return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
+        }
+        handle.setAuthCorpIds(corpIds);
 
         JobRedis realJob = new JobRedis();
         JobRoomJobRedis job = new JobRoomJobRedis();
@@ -71,7 +95,9 @@ public class WorkRoomController extends BaseController<WorkRoom> {
         /*先生成下载记录*/
         downObj.setMsg(Downfile.DEFAULT_MSG);
         downObj.setTitle(Downfile.WORM_ROOM);
-        downfileService.insert(downObj);
+        downObj.setAuthId(authUser.getId());
+        downObj.setAuthName(authUser.getName());
+        downfileService.save(downObj);
 
         /*推送简单任务*/
         job.setWorkRoomHandle(handle);
@@ -80,7 +106,7 @@ public class WorkRoomController extends BaseController<WorkRoom> {
         realJob.setDownFile(downObj);
         realJob.setJobName(JobRoomJobRedis.TASK_NAME);
 
-        redisUtil.leftPush(JobRedis.QUEUE_KEY,realJob);
+        redisUtil.leftPush(JobRedis.QUEUE_KEY, realJob);
 
         return AjaxResult.success("正在异步生成请稍后");
     }

src/main/java/com/mokamrp/privates/entity/GetWorkContactEmployeeHandle.java

@@ -14,13 +14,14 @@ public class GetWorkContactEmployeeHandle {
     private Integer gender;
     private Integer status;
     private String name;
-    private Integer start_deleted_at;
-    private Integer end_deleted_at;
-    private Integer start_created_at;
-    private Integer end_created_at;
-    private Integer group_id;
-    private Integer corp_id;
-    private List employee_id;
-    private List tag_id;
-    private Integer channel_code_id;
+    private Integer startDeletedAt;
+    private Integer endDeletedAt;
+    private Integer startCreatedAt;
+    private Integer endCreatedAt;
+    private Integer groupId;
+    private Integer corpId;
+    private List employeeId;
+    private List tagId;
+    private Integer channelCodeId;
+    private List<Integer> authCorpIds;
 }

src/main/java/com/mokamrp/privates/entity/GetWorkRoomHandle.java

@@ -19,6 +19,5 @@ public class GetWorkRoomHandle {
     private Integer corpGroupId;
     private List ownerId;
     private List tagId;
-
-
+    private List<Integer> authCorpIds;
 }

src/main/java/com/mokamrp/privates/entity/JobRedis.java

@@ -1,7 +1,6 @@
 package com.mokamrp.privates.entity;
 
 import com.mokamrp.privates.mapper.pojo.Downfile;
-import com.sun.xml.internal.ws.api.ha.StickyFeature;
 
 import java.io.Serializable;
 import java.util.Map;

src/main/java/com/mokamrp/privates/entity/JobWorkContactEmployeeRedis.java

@@ -7,113 +7,13 @@ import java.util.Map;
 public class JobWorkContactEmployeeRedis{
 
     public final static String TASK_NAME = "WorkContactEmployeeService";
+    private GetWorkContactEmployeeHandle workContactEmployeeHandle;
 
-    private Integer gender;
-    private Integer status;
-    private String name;
-    private Integer startDeletedAt;
-    private Integer endDeletedAt;
-    private Integer startCreatedAt;
-    private Integer endCreatedAt;
-    private Integer groupId;
-    private Integer corpId;
-    private List employeeId;
-    private List tagId ;
-    private Integer channelCodeId;
-
-    public Integer getGender() {
-        return gender;
-    }
-
-    public void setGender(Integer gender) {
-        this.gender = gender;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getStartDeletedAt() {
-        return startDeletedAt;
-    }
-
-    public void setStartDeletedAt(Integer startDeletedAt) {
-        this.startDeletedAt = startDeletedAt;
-    }
-
-    public Integer getEndDeletedAt() {
-        return endDeletedAt;
-    }
-
-    public void setEndDeletedAt(Integer endDeletedAt) {
-        this.endDeletedAt = endDeletedAt;
-    }
-
-    public Integer getStartCreatedAt() {
-        return startCreatedAt;
-    }
-
-    public void setStartCreatedAt(Integer startCreatedAt) {
-        this.startCreatedAt = startCreatedAt;
-    }
-
-    public Integer getEndCreatedAt() {
-        return endCreatedAt;
-    }
-
-    public void setEndCreatedAt(Integer endCreatedAt) {
-        this.endCreatedAt = endCreatedAt;
-    }
-
-    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 List getEmployeeId() {
-        return employeeId;
-    }
-
-    public void setEmployeeId(List employeeId) {
-        this.employeeId = employeeId;
-    }
-
-    public List getTagId() {
-        return tagId;
-    }
-
-    public void setTagId(List tagId) {
-        this.tagId = tagId;
-    }
-
-    public Integer getChannelCodeId() {
-        return channelCodeId;
+    public GetWorkContactEmployeeHandle getWorkContactEmployeeHandle() {
+        return workContactEmployeeHandle;
     }
 
-    public void setChannelCodeId(Integer channelCodeId) {
-        this.channelCodeId = channelCodeId;
+    public void setWorkContactEmployeeHandle(GetWorkContactEmployeeHandle workContactEmployeeHandle) {
+        this.workContactEmployeeHandle = workContactEmployeeHandle;
     }
 }

src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -28,27 +28,27 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        //.登录和健康监测 不验证token
-        String requestUrl = request.getContextPath() + request.getServletPath();
-        if (requestUrl.equals("/user/login") || requestUrl.equals("/ping")) {
-            return true;
-        }
-        String token = request.getHeader("Authorization");
-        //.Authorizetion 不存在token 拦截
-        if (token == null || token.isEmpty()) {
-            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
-            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-            return false;
-        }
-        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
-        Object userObj = JSON.parse(userInfoStr);
-        if (userObj == null) {
-            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
-            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-            return false;
-        }
-        User user = objectMapper.convertValue(userObj, User.class);
-        request.setAttribute("auth-user", user);
+//        //.登录和健康监测 不验证token
+//        String requestUrl = request.getContextPath() + request.getServletPath();
+//        if (requestUrl.equals("/user/login") || requestUrl.equals("/ping")) {
+//            return true;
+//        }
+//        String token = request.getHeader("Authorization");
+//        //.Authorizetion 不存在token 拦截
+//        if (token == null || token.isEmpty()) {
+//            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
+//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+//            return false;
+//        }
+//        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
+//        Object userObj = JSON.parse(userInfoStr);
+//        if (userObj == null) {
+//            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
+//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+//            return false;
+//        }
+//        User user = objectMapper.convertValue(userObj, User.class);
+//        request.setAttribute("auth-user", user);
         return true;
     }
 

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.pojo.ChatTool;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.Downfile;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.GroupCorp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Component;

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.Group;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.RoomTag;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -2,7 +2,7 @@ package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

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

@@ -1,7 +1,8 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +13,5 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @since 2021-04-17
  */
 public interface UserCorpMapper extends BaseMapper<UserCorp> {
-
+    public List<Integer> getCorpIds(Integer userId);
 }

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

@@ -21,4 +21,13 @@
         , user_id, corp_id, seq, create_at, update_at
     </sql>
 
+    <select id="getCorpIds" resultType="List">
+        SELECT
+            a.id
+        FROM
+            private_user_corp AS b
+            LEFT JOIN mc_corp AS a on b.corp_id = a.id
+        where b.user_id = (#{userId});
+    </select>
+
 </mapper>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.User;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,10 +1,11 @@
 package com.mokamrp.privates.mapper;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,8 +21,8 @@ import java.util.List;
  */
 public interface WorkContactEmployeeMapper extends BaseMapper<WorkContactEmployee> {
 
-    List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
-    List<WorkContactEmployeeVo> getAllVoList(@Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
-    Integer getVoListTotal(@Param("ew") EntityWrapper<WorkContactEmployee> queryWrapper);
+    List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
+    List<WorkContactEmployeeVo> getAllVoList(@Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
+    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);
 
 }

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

@@ -50,7 +50,7 @@
                  LEFT JOIN mc_work_contact AS c ON a.contact_id = c.id
                  LEFT JOIN mc_corp AS p ON p.id = a.corp_id
                  LEFT JOIN mc_channel_code AS l ON l.id = a.channel_code_id
-        where 1 = 1 ${ew.sqlSegment}
+        where 1 = 1 AND ${ew.sqlSegment}
     </select>
 
 

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

@@ -1,9 +1,10 @@
 package com.mokamrp.privates.mapper;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo;
 import org.apache.ibatis.annotations.Param;
@@ -19,9 +20,9 @@ import java.util.List;
  * @since 2021-04-21
  */
 public interface WorkContactRoomMapper extends BaseMapper<WorkContactRoom> {
-    List<WorkContactRoomGroupDataVo> getNum(@Param("ew") EntityWrapper<WorkContactRoom> queryWrapper);
+    List<WorkContactRoomGroupDataVo> getNum(@Param("ew") QueryWrapper<WorkContactRoom> queryWrapper);
 
-    List<WorkContactRoomByRoomIdVo> getListByRoomId(Page<WorkContactRoomByRoomIdVo> page, @Param("ew") EntityWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
+    List<WorkContactRoomByRoomIdVo> getListByRoomId(Page<WorkContactRoomByRoomIdVo> page, @Param("ew") QueryWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
 
-    Integer getListByRoomIdTotal(@Param("ew") EntityWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
+    Integer getListByRoomIdTotal(@Param("ew") QueryWrapper<WorkContactRoomByRoomIdVo> queryWrapper);
 }

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.mapper;
 
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>

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

@@ -1,10 +1,11 @@
 package com.mokamrp.privates.mapper;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,7 +21,7 @@ import java.util.List;
  * @since 2021-04-21
  */
 public interface WorkRoomMapper extends BaseMapper<WorkRoom> {
-    List<WorkRoomVo> getVoList(Page<WorkRoom> page, @Param("ew") EntityWrapper<WorkRoom> queryWrapper);
+    List<WorkRoomVo> getVoList(Page<WorkRoom> page, @Param("ew") QueryWrapper<WorkRoom> queryWrapper);
 
-    Integer getVoListTotal(@Param("ew") EntityWrapper<WorkRoom> queryWrapper);
+    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkRoom> queryWrapper);
 }

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

@@ -1,14 +1,10 @@
 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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
 

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,11 +1,9 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import org.apache.tomcat.util.bcel.Const;
 
 import java.io.Serializable;

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

@@ -1,14 +1,11 @@
 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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
 

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,12 +1,11 @@
 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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 
 /**

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

@@ -1,11 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-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 com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
 

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

@@ -1,15 +1,13 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableField;
-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;
 

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

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

@@ -1,15 +1,10 @@
 package com.mokamrp.privates.mapper.pojo;
 
-import com.baomidou.mybatisplus.enums.IdType;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 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;
 
 /**

src/main/java/com/mokamrp/privates/mapper/vo/WorkContactEmployeeVo.java

@@ -1,9 +1,5 @@
 package com.mokamrp.privates.mapper.vo;
 
-import com.baomidou.mybatisplus.activerecord.Model;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.enums.IdType;
 
 import java.io.Serializable;
 import java.util.Date;

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.mapper.pojo.ChatTool;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.Corp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.Downfile;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.GroupCorp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.Group;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

@@ -1,6 +1,6 @@
 package com.mokamrp.privates.service;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.mapper.pojo.User;
 
 import java.util.Map;

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

@@ -2,7 +2,7 @@ package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
 

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

@@ -1,9 +1,8 @@
 package com.mokamrp.privates.service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,15 +16,33 @@ import java.util.List;
  * @since 2021-04-17
  */
 public interface UserCorpService extends IService<UserCorp> {
+
+    public final static String USER_MSG = "您当前用户未绑定企业";
+
     /**
      * 获取指定管理账户管辖的企业信息
+     *
      * @param userId
      * @return
      */
     public List<Corp> getCorpsByUserId(Integer userId);
 
+    /**
+     * 获取用户管理的企业ID
+     *
+     * @param userId
+     * @return
+     */
     public List<Integer> getAuthUserCorpIds(Integer userId);
 
-    public boolean setUserCorpsByUserId(List<Integer> userIds,List<Integer> corpIds);
+    /**
+     * 绑定账户和企业
+     *
+     * @param userIds
+     * @param corpIds
+     * @return
+     */
+    public boolean setUserCorpsByUserId(List<Integer> userIds, List<Integer> corpIds);
+
 
 }

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.mapper.pojo.User;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>

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

@@ -1,10 +1,9 @@
 package com.mokamrp.privates.service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.mokamrp.privates.entity.GetWorkContactEmployeeHandle;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -24,16 +23,7 @@ import java.util.Map;
 public interface WorkContactEmployeeService extends IService<WorkContactEmployee> {
 
 
-    Map<String, Object> getPageList(Integer gender, Integer status,
-                                    Integer pagesize, Integer page, String name,
-                                    Integer start_deleted_at, Integer end_deleted_at,
-                                    Integer start_created_at, Integer end_created_at,
-                                    Integer group_id,
-                                    Integer corp_id, List employee_id, List tag_id, Integer channel_code_id);
+    Map<String, Object> getPageList(GetWorkContactEmployeeHandle handle);
 
-    void export(Downfile downFile,Integer gender, Integer status, String name,
-                Integer start_deleted_at, Integer end_deleted_at,
-                Integer start_created_at, Integer end_created_at,
-                Integer group_id,
-                Integer corp_id, List employee_id, List tag_id , Integer channel_code_id);
+    void export(Downfile downFile,GetWorkContactEmployeeHandle handle);
 }

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

@@ -2,7 +2,7 @@ package com.mokamrp.privates.service;
 
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.validation.BindingResult;
 
 import java.util.Map;

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

@@ -1,10 +1,9 @@
 package com.mokamrp.privates.service;
 
-import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package com.mokamrp.privates.service;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.WorkRoom;
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,9 +1,9 @@
 package com.mokamrp.privates.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.mapper.pojo.ChatTool;
 import com.mokamrp.privates.mapper.ChatToolMapper;
 import com.mokamrp.privates.service.ChatToolService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,12 +1,10 @@
 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.Corp;
 import com.mokamrp.privates.mapper.CorpMapper;
 import com.mokamrp.privates.service.CorpService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
@@ -31,7 +29,7 @@ public class CorpServiceImpl extends ServiceImpl<CorpMapper, Corp> implements Co
      * @return
      */
     public List<Corp> GetCorpInfoByCorpIds(List<Integer> corps){
-        List<Corp> res = this.selectList(new EntityWrapper<Corp>().in("id",corps));
+        List<Corp> res = this.listByIds(corps);
         return res;
     }
 }

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

@@ -3,7 +3,7 @@ package com.mokamrp.privates.service.impl;
 import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.DownfileMapper;
 import com.mokamrp.privates.service.DownfileService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,18 +1,12 @@
 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 com.baomidou.mybatisplus.extension.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;
 

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

@@ -3,7 +3,7 @@ package com.mokamrp.privates.service.impl;
 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,8 +1,8 @@
 package com.mokamrp.privates.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.mapper.UserMapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
@@ -12,15 +12,9 @@ import com.mokamrp.privates.service.UserService;
 import com.mokamrp.privates.utils.StringUtils;
 import com.mokamrp.privates.utils.sign.Md5Utils;
 import com.mokamrp.privates.constant.Constants;
-//import io.netty.util.internal.StringUtil;
-//import javafx.beans.binding.ObjectExpression;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -38,7 +32,7 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
     public StringRedisTemplate redis;
 
     public Map<String, Object> doLogin(String phone, String password) {
-        Map<String, Object> res = selectMap(new EntityWrapper<User>().eq("phone", phone));
+        Map<String, Object> res =this.getMap(new QueryWrapper<User>().eq("phone", phone));
         //.验证账户名和密码
         if (res.isEmpty()) {
             res.put("loginStatus", "phoneNull");

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

@@ -1,13 +1,12 @@
 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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.entity.GetEmployeeTagHandle;
 import com.mokamrp.privates.mapper.pojo.Tag;
 import com.mokamrp.privates.mapper.TagMapper;
 import com.mokamrp.privates.service.TagService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.IndexHandle;
@@ -37,9 +36,9 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagSe
      * @since 1949-10-01
      */
     public IndexBaseRes<Tag> base(IndexHandle indexhandle) {
-        Integer total = this.selectCount(new EntityWrapper<Tag>());
+        Integer total = this.count(new QueryWrapper<Tag>());
         Iterator fileterIt = indexhandle.getFilter().entrySet().iterator();
-        Wrapper<Tag> warpper = new EntityWrapper<Tag>();
+        QueryWrapper<Tag> warpper = new QueryWrapper<Tag>();
         //.@leon where like,=,<>
         while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
@@ -60,14 +59,14 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagSe
             String sort = indexhandle.getSort();
             if (!order.isEmpty() && !sort.isEmpty()) {
                 if (order.equals("asc")) {
-                    warpper = warpper.orderBy(sort, true);
+                    warpper = warpper.orderByAsc(sort);
                 } else if (order.equals("desc")) {
-                    warpper = warpper.orderBy(sort, false);
+                    warpper = warpper.orderByDesc(sort);
                 }
             }
         }
         //.@leon offset limit
-        Page<Tag> page = this.selectPage(
+        Page<Tag> page = this.page(
                 new Page<Tag>(indexhandle.getOffset(), indexhandle.getLimit()), warpper
         );
         IndexBaseRes<Tag> result = new IndexBaseRes<Tag>();

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

@@ -1,13 +1,14 @@
 package com.mokamrp.privates.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.mapper.DownfileMapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.mapper.UserCorpMapper;
 import com.mokamrp.privates.service.CorpService;
 import com.mokamrp.privates.service.UserCorpService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,6 +29,9 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
     @Autowired
     public CorpService corpService;
 
+//    @Autowired
+//    private UserCorpMapper userCorpMapper;
+
     /**
      * 获取指定管理账户管辖的企业信息
      *
@@ -36,7 +40,7 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
      */
     public List<Corp> getCorpsByUserId(Integer userId) {
         List<Integer> corpIds = new ArrayList<Integer>();
-        List<UserCorp> corps = this.selectList(new EntityWrapper<UserCorp>().eq("user_id", userId));
+        List<UserCorp> corps = this.list(new QueryWrapper<UserCorp>().eq("user_id", userId));
         for (UserCorp userCorp : corps) {
             corpIds.add(userCorp.getCorpId());
         }
@@ -52,7 +56,7 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
      */
     public List<Integer> getAuthUserCorpIds(Integer userId) {
         List<Integer> corpIds = new ArrayList<Integer>();
-        List<UserCorp> corps = this.selectList(new EntityWrapper<UserCorp>().eq("user_id", userId));
+        List<UserCorp> corps = this.list(new QueryWrapper<UserCorp>().eq("user_id", userId));
         for (UserCorp userCorp : corps) {
             corpIds.add(userCorp.getCorpId());
         }
@@ -61,36 +65,37 @@ public class UserCorpServiceImpl extends ServiceImpl<UserCorpMapper, UserCorp> i
 
     /**
      * 绑定账户和企业ID
+     *
      * @param userIds
      * @param corpIds
      * @return
      */
-    public boolean setUserCorpsByUserId(List<Integer> userIds,List<Integer> corpIds){
-        for (int i = 0; i < userIds.size(); i++){
+    public boolean setUserCorpsByUserId(List<Integer> userIds, List<Integer> corpIds) {
+        for (int i = 0; i < userIds.size(); i++) {
             //.当前库里当前用户的所有企业
-            List<UserCorp> corps = this.selectList(new EntityWrapper<UserCorp>().eq("user_id",userIds.get(i)));
+            List<UserCorp> corps = this.list(new QueryWrapper<UserCorp>().eq("user_id", userIds.get(i)));
             List<UserCorp> add = new ArrayList<UserCorp>();
             //.遍历本次需要绑定的企业ID
-            for (int c = 0; c < corpIds.size(); c++){
+            for (int c = 0; c < corpIds.size(); c++) {
                 //.遍历企业库里企业 和本次绑定企业
                 Boolean hasCorp = false;
-                for (UserCorp userCorp : corps){
-                    if (userCorp.getCorpId().equals(corpIds.get(c))){
+                for (UserCorp userCorp : corps) {
+                    if (userCorp.getCorpId().equals(corpIds.get(c))) {
                         hasCorp = true;
                     }
                 }
-                if (hasCorp == false){
+                if (hasCorp == false) {
                     UserCorp userCorpObj = new UserCorp();
                     userCorpObj.setCorpId(corpIds.get(c));
                     userCorpObj.setUserId(userIds.get(i));
                     add.add(userCorpObj);
                 }
             }
-            if (add.size() > 0){
-                this.insertBatch(add);
+            if (add.size() > 0) {
+                this.saveBatch(add);
             }
         }
         return true;
-    }
 
+    }
 }

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

@@ -3,7 +3,7 @@ package com.mokamrp.privates.service.impl;
 import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.mapper.UserMapper;
 import com.mokamrp.privates.service.UserService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -2,9 +2,10 @@ package com.mokamrp.privates.service.impl;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
+import com.mokamrp.privates.entity.GetWorkContactEmployeeHandle;
 import com.mokamrp.privates.mapper.CorpMapper;
 import com.mokamrp.privates.mapper.DownfileMapper;
 import com.mokamrp.privates.mapper.pojo.Downfile;
@@ -12,7 +13,7 @@ import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.mokamrp.privates.mapper.WorkContactEmployeeMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.service.WorkContactEmployeeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import org.apache.ibatis.annotations.Param;
 import org.apache.tomcat.util.bcel.Const;
@@ -46,56 +47,15 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
     private OSSConfiguration ossConfiguration;
 
     @Autowired
-    private WorkContactEmployeeMapper mapperObj  ;
+    private WorkContactEmployeeMapper mapperObj;
 
     @Override
-    public Map<String, Object> getPageList(Integer gender, Integer status,
-                                           Integer pagesize, Integer page, String name,
-                                           Integer start_deleted_at, Integer end_deleted_at,
-                                           Integer start_created_at, Integer end_created_at,
-                                           Integer group_id,
-                                           Integer corp_id, List employee_id, List tag_id, Integer channel_code_id) {
 
-        Page<WorkContactEmployeeVo> pageObj = new Page<>(page, pagesize);
-        EntityWrapper<WorkContactEmployee> obj = new EntityWrapper<WorkContactEmployee>();
+    public Map<String, Object> getPageList(GetWorkContactEmployeeHandle handle) {
 
-        if(name != null && !name.equals("")){
-            obj.like("c.name", name);
-        }
-
-        if (gender != null) {
-            obj.eq("c.gender", gender);
-        }
-
-        if (status != null) {
-            obj.eq("a.`status`", status);
-        }
-
-        if (channel_code_id != null) {
-            obj.eq("a.channel_code_id", channel_code_id);
-        }
-
-        if (start_deleted_at != null) {
-            obj.ge("c.deleted_at", start_deleted_at);
-        }
-
-        if (end_created_at != null) {
-            obj.le("c.deleted_at", end_deleted_at);
-        }
-
-        if (start_created_at != null) {
-            obj.ge("c.created_at", start_created_at);
-        }
+        Page<WorkContactEmployeeVo> pageObj = new Page<>(handle.getPage(), handle.getPagesize());
+        QueryWrapper<WorkContactEmployee> obj = getWrapper(handle);
 
-        if (end_created_at != null) {
-            obj.le("c.created_at", end_created_at);
-        }
-        if (corp_id != null) {
-            obj.eq("a.corp_id", corp_id);
-        }
-        if (employee_id != null) {
-            obj.in("a.employee_id", employee_id);
-        }
 
         List<WorkContactEmployeeVo> list = mapperObj.getVoList(pageObj, obj);
 
@@ -110,63 +70,20 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
     }
 
     @Override
-    public void export(Downfile downFile,Integer gender, Integer status, String name,
-                                           Integer start_deleted_at, Integer end_deleted_at,
-                                           Integer start_created_at, Integer end_created_at,
-                                           Integer group_id,
-                                           Integer corp_id, List employee_id, List tag_id , Integer channel_code_id){
+    public void export(Downfile downFile, GetWorkContactEmployeeHandle handle) {
 
-        EntityWrapper<WorkContactEmployee> obj = new EntityWrapper<WorkContactEmployee>();
         List<Object> tempObj;
-
-        if(name != null && !name.equals("")){
-            obj.like("c.name",name);
-        }
-
-        if(gender != null){
-            obj.eq("c.gender",gender);
-        }
-
-        if(status != null) {
-            obj.eq("a.`status`", status);
-        }
-
-        if(channel_code_id != null) {
-            obj.eq("a.channel_code_id", channel_code_id);
-        }
-
-        if(start_deleted_at != null) {
-            obj.ge("c.deleted_at", start_deleted_at);
-        }
-
-        if(end_created_at != null) {
-            obj.le("c.deleted_at", end_deleted_at);
-        }
-
-        if(start_created_at != null) {
-            obj.ge("c.created_at", start_created_at);
-        }
-
-        if(end_created_at != null) {
-            obj.le("c.created_at", end_created_at);
-        }
-        if(corp_id != null) {
-            obj.eq("a.corp_id", corp_id);
-        }
-        if(employee_id !=null) {
-            obj.in("a.employee_id", employee_id);
-        }
-
+        QueryWrapper<WorkContactEmployee> obj = getWrapper(handle);
         List<WorkContactEmployeeVo> list = mapperObj.getAllVoList(obj);
 
         //实现下载
         List<List<Object>> resList = new ArrayList<List<Object>>();
-        Object[] head = { "id", "客户昵称", "状态","渠道码id","渠道名称","客户删除时间","客户创建时间","unionid","客服名称","公司名称" };
+        Object[] head = {"id", "客户昵称", "状态", "渠道码id", "渠道名称", "客户删除时间", "客户创建时间", "unionid", "客服名称", "公司名称"};
         List<Object> headList = Arrays.asList(head);
         resList.add(headList);
 
-        if(list.size() >=1){
-            for (WorkContactEmployeeVo o: list){
+        if (list.size() >= 1) {
+            for (WorkContactEmployeeVo o : list) {
                 tempObj = new ArrayList<Object>() {//这个大括号 就相当于我们  new 接口
                     {//这个大括号 就是 构造代码块 会在构造函数前 调用
                         this.add(o.getId());
@@ -182,7 +99,6 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
                     }
                 };
                 resList.add(tempObj);
-
             }
         }
 
@@ -192,16 +108,79 @@ public class WorkContactEmployeeServiceImpl extends ServiceImpl<WorkContactEmplo
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String dateString = formatter.format(currentTime);
-        String filePath = OSSConfiguration.DOWN_DIR+dateString+"/"+downFile.getId().toString()+"_"+Downfile.WORK_CONTACT_EMPLOYEE;
+        String filePath = OSSConfiguration.DOWN_DIR + dateString + "/" + downFile.getId().toString() + "_" + Downfile.WORK_CONTACT_EMPLOYEE;
 
         PutObjectRequest putObjectRequest = new PutObjectRequest(ossConfiguration.getBucketName(), filePath, new ByteArrayInputStream(content.toString().getBytes()));
         ossClient.putObject(putObjectRequest);
 
-        downFile.setDownUrl(ossConfiguration.getHost()+filePath);
+        downFile.setDownUrl(ossConfiguration.getHost() + filePath);
         downFile.setStatus(1);
         downfileMapper.updateById(downFile);
 
         return;
     }
 
+    private QueryWrapper<WorkContactEmployee> getWrapper(GetWorkContactEmployeeHandle handle) {
+
+        QueryWrapper<WorkContactEmployee> obj = new QueryWrapper<WorkContactEmployee>();
+
+        Integer gender = handle.getGender();
+        Integer status = handle.getStatus();
+        String name = handle.getName();
+        Integer startDeletedAt = handle.getStartDeletedAt();
+        Integer endDeletedAt = handle.getEndDeletedAt();
+        Integer startCreatedAt = handle.getStartCreatedAt();
+        Integer endCreatedAt = handle.getEndCreatedAt();
+        Integer group_id = handle.getGroupId();
+        Integer corpId = handle.getCorpId();
+        List employeeId = handle.getEmployeeId();
+        List tagId = handle.getTagId();
+        Integer channel_code_id = handle.getChannelCodeId();
+        List<Integer> authCorpIds = handle.getAuthCorpIds();
+
+        if (name != null && !name.equals("")) {
+            obj.like("c.name", name);
+        }
+
+        if (gender != null) {
+            obj.eq("c.gender", gender);
+        }
+
+        if (status != null) {
+            obj.eq("a.`status`", status);
+        }
+
+        if (channel_code_id != null) {
+            obj.eq("a.channel_code_id", channel_code_id);
+        }
+
+        if (startDeletedAt != null) {
+            obj.ge("c.deleted_at", startDeletedAt);
+        }
+
+        if (endDeletedAt != null) {
+            obj.le("c.deleted_at", endDeletedAt);
+        }
+
+        if (startCreatedAt != null) {
+            obj.ge("c.created_at", startCreatedAt);
+        }
+
+        if (endCreatedAt != null) {
+            obj.le("c.created_at", endCreatedAt);
+        }
+        if (corpId != null) {
+            obj.eq("a.corp_id", corpId);
+        }
+
+        if (employeeId != null) {
+            obj.in("a.employee_id", employeeId);
+        }
+
+        obj.in("a.corp_id", authCorpIds);
+
+        return obj;
+
+    }
+
 }

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

@@ -1,7 +1,7 @@
 package com.mokamrp.privates.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.help.AjaxResult;
@@ -9,7 +9,7 @@ import com.mokamrp.privates.mapper.pojo.WorkContactRoom;
 import com.mokamrp.privates.mapper.WorkContactRoomMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomByRoomIdVo;
 import com.mokamrp.privates.service.WorkContactRoomService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,7 +42,7 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
         }
 
         Iterator fileterIt = indexHandle.getFilter().entrySet().iterator();
-        EntityWrapper<WorkContactRoomByRoomIdVo> warpper = new EntityWrapper<WorkContactRoomByRoomIdVo>();
+        QueryWrapper<WorkContactRoomByRoomIdVo> warpper = new QueryWrapper<WorkContactRoomByRoomIdVo>();
         //.@leon where like,=,<>
         while (fileterIt.hasNext()) {
             Map.Entry entray = (Map.Entry) fileterIt.next();
@@ -66,9 +66,9 @@ public class WorkContactRoomServiceImpl extends ServiceImpl<WorkContactRoomMappe
             String sort = indexHandle.getSort();
             if (!order.isEmpty() && !sort.isEmpty()) {
                 if (order.equals("asc")) {
-                    warpper.orderBy(sort, true);
+                    warpper.orderByAsc(sort);
                 } else if (order.equals("desc")) {
-                    warpper.orderBy(sort, false);
+                    warpper.orderByDesc(sort);
                 }
             }
         }

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

@@ -1,7 +1,5 @@
 package com.mokamrp.privates.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.mapper.GroupCorpMapper;
 import com.mokamrp.privates.mapper.GroupMapper;
@@ -10,7 +8,7 @@ import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.mokamrp.privates.mapper.WorkEmployeeMapper;
 import com.mokamrp.privates.service.UserCorpService;
 import com.mokamrp.privates.service.WorkEmployeeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -2,8 +2,8 @@ package com.mokamrp.privates.service.impl;
 
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
@@ -14,13 +14,12 @@ import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import com.mokamrp.privates.mapper.vo.WorkContactRoomGroupDataVo;
 import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.WorkRoomService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-
 import java.io.ByteArrayInputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -69,8 +68,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         resMap.put("list", null);
         resMap.put("total", 0);
 
-        EntityWrapper<WorkRoom> obj = getWrapper(handle.getName(), handle.getCorpId(), handle.getStartCreateTime(),
-                handle.getEndCreateTime(), handle.getWxChatId(), handle.getCorpGroupId(), handle.getOwnerId(), handle.getTagId());
+        QueryWrapper<WorkRoom> obj = getWrapper(handle);
 
         Integer total = mapperObj.getVoListTotal(obj);
         resMap.put("total", total);
@@ -98,8 +96,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         List<Object> headList = Arrays.asList(head);
         Date currentTime = new Date();
 
-        EntityWrapper<WorkRoom> obj = getWrapper(handle.getName(), handle.getCorpId(), handle.getStartCreateTime(),
-                handle.getEndCreateTime(), handle.getWxChatId(), handle.getCorpGroupId(), handle.getOwnerId(), handle.getTagId());
+        QueryWrapper<WorkRoom> obj = getWrapper(handle);
         Integer total = mapperObj.getVoListTotal(obj);
         Page<WorkRoom> pageObj = new Page<>(1, total);
         List<WorkRoomVo> list = getCommonList(pageObj, obj);
@@ -143,7 +140,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         return;
     }
 
-    private List<WorkRoomVo> getCommonList(Page<WorkRoom> pageObj, EntityWrapper<WorkRoom> room) {
+    private List<WorkRoomVo> getCommonList(Page<WorkRoom> pageObj, QueryWrapper<WorkRoom> room) {
 
         List<WorkRoomVo> list = mapperObj.getVoList(pageObj, room);
 
@@ -169,12 +166,20 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
     }
 
-    private EntityWrapper<WorkRoom> getWrapper(String name, Integer corp_id,
-                                               String start_create_time, String end_create_time,
-                                               String wx_chat_id, Integer corp_group_id,
-                                               List owner_id, List tag_id) {
+    private QueryWrapper<WorkRoom> getWrapper(GetWorkRoomHandle handle) {
+        String name = handle.getName();
+        Integer corp_id = handle.getCorpId();
+        String start_create_time = handle.getStartCreateTime();
+        String end_create_time = handle.getEndCreateTime();
+        String wx_chat_id = handle.getWxChatId();
+        Integer corp_group_id = handle.getCorpGroupId();
+        List owner_id = handle.getOwnerId();
+        List tag_id = handle.getTagId();
+        List<Integer> authCorpIds = handle.getAuthCorpIds();
+
+        QueryWrapper<WorkRoom> obj = new QueryWrapper<WorkRoom>();
 
-        EntityWrapper<WorkRoom> obj = new EntityWrapper<WorkRoom>();
+        obj.in("a.corp_id", authCorpIds);
 
         if (name != null && !"".equals(name)) {
             obj.like("a.name", name);
@@ -226,7 +231,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         //3-绑定插入但是要检测已经存在的
 
-        EntityWrapper<RoomTag> obj = new EntityWrapper<RoomTag>();
+        QueryWrapper<RoomTag> obj = new QueryWrapper<RoomTag>();
         obj.in("id", ids);
         RoomTag roomTagObj;
 
@@ -234,7 +239,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         for (Integer id : ids) {
             for (Integer tagId : tagIds) {
                 //检测是否已经存在
-                obj = new EntityWrapper<RoomTag>();
+                obj = new QueryWrapper<RoomTag>();
                 obj.eq("room_id", id);
                 obj.eq("tag_id", tagId);
 
@@ -263,7 +268,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
         //3-绑定插入但是要检测已经存在的
         //roomTagMapperObj.
-        EntityWrapper<RoomTag> obj = new EntityWrapper<RoomTag>();
+        QueryWrapper<RoomTag> obj = new QueryWrapper<RoomTag>();
         obj.in("id", ids);
         RoomTag roomTagObj;
 
@@ -271,7 +276,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         for (Integer id : ids) {
             for (Integer tagId : tagIds) {
                 //检测是否已经存在
-                obj = new EntityWrapper<RoomTag>();
+                obj = new QueryWrapper<RoomTag>();
                 obj.eq("room_id", id);
                 obj.eq("tag_id", tagId);
                 if (roomTagMapperObj.selectCount(obj) >= 0) {//插入
@@ -285,7 +290,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
     private Object checkOption(Integer[] ids, Integer[] tagIds) {
         //1-先查room是否存在
-        EntityWrapper<WorkRoom> obj = new EntityWrapper<WorkRoom>();
+        QueryWrapper<WorkRoom> obj = new QueryWrapper<WorkRoom>();
         obj.in("id", ids);
 
         Integer total = mapperObj.selectCount(obj);
@@ -294,7 +299,7 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         }
 
         //2-tag是否都存在
-        EntityWrapper<Tag> tagWrapper = new EntityWrapper<Tag>();
+        QueryWrapper<Tag> tagWrapper = new QueryWrapper<Tag>();
         tagWrapper.in("id", tagIds);
         Integer tagTotal = tagMapperObj.selectCount(tagWrapper);
 
@@ -311,26 +316,26 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         String todayEndDate = (new SimpleDateFormat("yyyy-MM-dd 23:59:59")).format(new Date());
 
         //获取数据 群人数 ，当日新增，当日离开
-        EntityWrapper<WorkContactRoom> contactRoomEntityWrapperTotal = new EntityWrapper<WorkContactRoom>();
-        EntityWrapper<WorkContactRoom> contactRoomEntityWrapperTodayAdd = new EntityWrapper<WorkContactRoom>();
-        EntityWrapper<WorkContactRoom> contactRoomEntityWrapperTodayLeft = new EntityWrapper<WorkContactRoom>();
-        contactRoomEntityWrapperTotal.in("room_id", ids);
-        contactRoomEntityWrapperTotal.eq("status", 1);
-
-        contactRoomEntityWrapperTodayAdd.in("room_id", ids);
-        contactRoomEntityWrapperTodayAdd.eq("status", 1);
-        contactRoomEntityWrapperTodayAdd.le("join_time", todayEndDate);
-        contactRoomEntityWrapperTodayAdd.ge("join_time", todayStartDate);//大于
-
-
-        contactRoomEntityWrapperTodayLeft.in("room_id", ids);
-        contactRoomEntityWrapperTodayLeft.eq("status", 2);
-        contactRoomEntityWrapperTodayLeft.le("out_time", todayEndDate);
-        contactRoomEntityWrapperTodayLeft.ge("out_time", todayStartDate);//大于
-
-        List<WorkContactRoomGroupDataVo> todayLefts = contanctMapperObj.getNum(contactRoomEntityWrapperTodayLeft);
-        List<WorkContactRoomGroupDataVo> todayAdds = contanctMapperObj.getNum(contactRoomEntityWrapperTodayAdd);
-        List<WorkContactRoomGroupDataVo> totals = contanctMapperObj.getNum(contactRoomEntityWrapperTotal);
+        QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTotal = new QueryWrapper<WorkContactRoom>();
+        QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayAdd = new QueryWrapper<WorkContactRoom>();
+        QueryWrapper<WorkContactRoom> contactRoomQueryWrapperTodayLeft = new QueryWrapper<WorkContactRoom>();
+        contactRoomQueryWrapperTotal.in("room_id", ids);
+        contactRoomQueryWrapperTotal.eq("status", 1);
+
+        contactRoomQueryWrapperTodayAdd.in("room_id", ids);
+        contactRoomQueryWrapperTodayAdd.eq("status", 1);
+        contactRoomQueryWrapperTodayAdd.le("join_time", todayEndDate);
+        contactRoomQueryWrapperTodayAdd.ge("join_time", todayStartDate);//大于
+
+
+        contactRoomQueryWrapperTodayLeft.in("room_id", ids);
+        contactRoomQueryWrapperTodayLeft.eq("status", 2);
+        contactRoomQueryWrapperTodayLeft.le("out_time", todayEndDate);
+        contactRoomQueryWrapperTodayLeft.ge("out_time", todayStartDate);//大于
+
+        List<WorkContactRoomGroupDataVo> todayLefts = contanctMapperObj.getNum(contactRoomQueryWrapperTodayLeft);
+        List<WorkContactRoomGroupDataVo> todayAdds = contanctMapperObj.getNum(contactRoomQueryWrapperTodayAdd);
+        List<WorkContactRoomGroupDataVo> totals = contanctMapperObj.getNum(contactRoomQueryWrapperTotal);
 
 
         HashMap<Integer, HashMap<String, Integer>> dataById =

src/main/java/com/mokamrp/privates/tast/ExportJobTask.java

@@ -48,21 +48,12 @@ public class ExportJobTask {
                 case "Room":
                     JobRoomJobRedis job= out.getJobRoomJobRedis();
                     workRoomService.export(downFile,job.getWorkRoomHandle());
-                    break; //可选
+                    break;
                 case "WorkContactEmployeeService":
                     JobWorkContactEmployeeRedis eJob= out.getJobWorkContactEmployeeRedis();
-                    System.out.println("=======WorkContactEmployeeService======");
-                    System.out.println(eJob.getName());
-
-                    workContactEmployeeService.export(downFile,eJob.getGender(),eJob.getStatus(),eJob.getName(),
-                            eJob.getStartDeletedAt(),eJob.getEndDeletedAt(),
-                            eJob.getStartCreatedAt(), eJob.getEndCreatedAt(),
-                            eJob.getGroupId(),eJob.getCorpId(),eJob.getEmployeeId(), eJob.getTagId(), eJob.getChannelCodeId()
-                    );
-
-                    //语句
-                    break; //可选
-                default : //可选
+                    workContactEmployeeService.export(downFile,eJob.getWorkContactEmployeeHandle());
+                    break;
+                default :
             }
         }
 

src/main/resources/template/serviceImpl.java.vm

@@ -1,6 +1,6 @@
 package ${package.ServiceImpl};
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.QueryWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import ${package.Entity}.${entity};

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

@@ -1,11 +1,11 @@
 package com.mokamrp;
 
-import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-import com.baomidou.mybatisplus.generator.config.rules.DbType;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import org.springframework.beans.factory.annotation.Value;
 import org.junit.Test;
@@ -47,8 +47,8 @@ public class AutoMP {
 		StrategyConfig stConfig = new StrategyConfig();
 		stConfig.setCapitalMode(true) //全局大写命名
 				.setRestControllerStyle(true) //.RestController
-				.setDbColumnUnderline(true)  // 指定表名 字段名是否使用下划线
 				.setSuperControllerClass("BaseController")
+				.setColumnNaming(NamingStrategy.underline_to_camel)
 				.setNaming(NamingStrategy.underline_to_camel) // 数据库表映射到实体的命名策略，下划线转驼峰命名
 				.setTablePrefix("mc_") //表名前缀
 				.setInclude("mc_work_employee");  // 生成的表