Merge remote-tracking branch 'origin/master'

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

@@ -37,6 +37,7 @@ public class UserCorpController {
      */
     @GetMapping("/getAuthUserCorps")
     public Object getAuthUserCorps(@AuthUser User authUser){
+
         List<Corp> res = userCorpService.getCorpsByUserId(authUser.getId());
         return AjaxResult.success(Constants.SUCCESS,res);
     }

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

@@ -69,16 +69,14 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
 
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
 
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
@@ -88,22 +86,19 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
         Map<String, Object> resMap = WorkContactEmployeeService.getPageList(handle);//所有
 
         return AjaxResult.success(resMap);
-
     }
 
     @RequestMapping("/export")
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody GetWorkContactEmployeeHandle handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -112,8 +107,9 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
 
         Downfile downObj = new Downfile();
         downObj.setMsg(Downfile.DEFAULT_MSG);
-        downObj.setAuthId(authUser.getId());
+        downObj.setAuthId(Integer.parseInt(authUser.getId().toString()));
         downObj.setAuthName(authUser.getName());
+
         downObj.setTitle(Downfile.WORK_CONTACT_EMPLOYEE);
         downfileService.save(downObj);
 

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

@@ -1,6 +1,13 @@
 package com.mokamrp.privates.controller;
 
+import com.mokamrp.privates.constant.Constants;
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.PostWorkEmployee;
+import com.mokamrp.privates.entity.SetWorkEmployeeTagHandle;
+import com.mokamrp.privates.entity.WorkEmployeeHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.entity.*;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
@@ -62,8 +69,8 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
             return AjaxResult.error(HttpStatus.LOGIN_ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
-        Object res = workEmployeeService.selectWorkEmployeeList(user.getUserid(), workEmployee);
+        List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
+        Object res = workEmployeeService.selectWorkEmployeeList(authUser.getId().toString(), workEmployee);
         return AjaxResult.success(res);
     }
 
@@ -71,16 +78,13 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -92,19 +96,32 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
 
     }
 
+
+    /**
+     * 设置客服标签
+     * @param setTagHandle
+     * @return
+     */
+    @PostMapping("/setTag")
+    public Object setTag(@RequestBody SetWorkEmployeeTagHandle setTagHandle){
+        if(setTagHandle.getEmployeeIds().size() <= 0){
+            return AjaxResult.error("employeeIds null");
+        }
+        workEmployeeService.setTag(setTagHandle.getTagId(),setTagHandle.getEmployeeIds());
+        return AjaxResult.success(Constants.SUCCESS);
+    }
+
     @RequestMapping("/export")
     @ResponseBody
     public Object export(
             @AuthUser User authUser,
-            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody PostWorkEmployee handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if(corpIds.size() <=0){
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

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

@@ -61,16 +61,13 @@ public class WorkRoomController extends BaseController<WorkRoom> {
     @ResponseBody
     public Object getList(
             @AuthUser User authUser,
-            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
-            HttpServletRequest request) {
-
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
+            @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds  = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }
@@ -88,12 +85,11 @@ public class WorkRoomController extends BaseController<WorkRoom> {
             @Valid @RequestBody GetWorkRoomHandle handle, BindingResult bindingResult,
             HttpServletRequest request) {
 
-        XxlSsoUser user = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(user.getUserid());
+        List<Integer> corpIds = userCorpService.getAuthUserCorpIds(authUser.getId().toString());
         if (corpIds.size() <= 0) {
             return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
         }

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

@@ -17,4 +17,5 @@ public class PostWorkEmployee {
     private Integer gender;
     private Integer groupId;
     private String mobile;
+    private Integer privateTagId;
 }

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

@@ -0,0 +1,13 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class SetWorkEmployeeTagHandle {
+    private List<Integer> employeeIds;
+    @NotBlank(message = "标签ID不可为空")
+    private Integer tagId;
+}

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

@@ -24,5 +24,7 @@ public class WorkEmployeeHandle {
     private String admin;
     //.标签
     private Integer tag;
+    //.标签
+    private Integer privateTagId;
 
 }

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

@@ -53,11 +53,11 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
 //        User user = objectMapper.convertValue(userObj, User.class);
 //        request.setAttribute("auth-user", user);
         XxlSsoUser xxlSsoUser = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
-        //Map<String, String> plugininfo=xxlSsoUser.getPlugininfo();
+        Map<String, String> plugininfo=xxlSsoUser.getPlugininfo();
         User user=new User();
-        //user.setId(Integer.getInteger(plugininfo.get("employeeNo")));
+        user.setId(Integer.valueOf(plugininfo.get("employeeNo")));
         user.setName(xxlSsoUser.getUsername());
-        //user.setGender(Integer.getInteger(plugininfo.get("employeeNo")));
+//        user.setGender(Integer.getInteger(plugininfo.get("employeeNo")));
         user.setIsSuperAdmin(1);
         request.setAttribute("auth-user", user);
 

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

@@ -57,12 +57,14 @@
             A.in_group_cnt,
             A.wx_user_id,
             C.`name` AS companyName,
-            D.group_id
+            D.group_id,
+            E.tag_name
         FROM
             mc_work_employee AS A
             LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
             LEFT JOIN private_group AS B ON D.group_id = B.id
             LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+            LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>
@@ -78,6 +80,7 @@
         LEFT JOIN private_group_corp AS D ON A.corp_id = D.corp_id
         LEFT JOIN private_group AS B ON D.group_id = B.id
         LEFT JOIN mc_corp AS C ON A.corp_id = C.id
+        LEFT JOIN private_tag AS E ON E.id = A.private_tag_id
         <where>
             ${ew.sqlSegment}
         </where>

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

@@ -4,6 +4,8 @@ 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 lombok.Data;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -15,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-04-20
  */
+@Data
 @TableName("mc_work_employee")
 public class WorkEmployee extends Model<WorkEmployee> {
 
@@ -109,6 +112,19 @@ public class WorkEmployee extends Model<WorkEmployee> {
     /**
      * 是否配置外部联系人权限（1.是 2.否）
      */
+    /**
+     * 小前台标签ID
+     */
+    private Integer privateTagId;
+    /**
+     * 小前台手机编号
+     */
+    private Integer privatePhoneCode;
+    /**
+     * 小前台客服负责人
+     */
+    private Integer privateUserId;
+
     private Integer contactAuth;
     private Date createdAt;
     private Date updatedAt;

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

@@ -33,6 +33,15 @@ public class WorkEmployeeVo {
     private Object fanNum;
     private String wxUserId;
     private Integer groupId;
+    private String tagName;
+
+    public String getTagName() {
+        return tagName;
+    }
+
+    public void setTagName(String tagName) {
+        this.tagName = tagName;
+    }
 
     public Integer getGroupId() {
         return groupId;

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

@@ -25,4 +25,6 @@ public interface WorkEmployeeService extends IService<WorkEmployee> {
     public Map<String, Object> getPageList(PostWorkEmployee handle);
 
     public void export(Downfile downFile, PostWorkEmployee handle);
+
+    public boolean setTag(Integer tagId,List<Integer> employeeIds);
 }

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

@@ -1,6 +1,7 @@
 package com.mokamrp.privates.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.mapper.pojo.Corp;
 import com.mokamrp.privates.mapper.CorpMapper;
 import com.mokamrp.privates.service.CorpService;
@@ -29,7 +30,7 @@ public class CorpServiceImpl extends ServiceImpl<CorpMapper, Corp> implements Co
      * @return
      */
     public List<Corp> GetCorpInfoByCorpIds(List<Integer> corps){
-        List<Corp> res = this.listByIds(corps);
+        List<Corp> res = this.list(new QueryWrapper<Corp>().in("id",corps));
         return res;
     }
 }

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

@@ -3,6 +3,7 @@ package com.mokamrp.privates.service.impl;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.model.PutObjectRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mokamrp.privates.config.OSSConfiguration;
 import com.mokamrp.privates.entity.GetWorkRoomHandle;
@@ -17,6 +18,7 @@ import com.mokamrp.privates.service.WorkEmployeeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mokamrp.privates.utils.OssFile;
 import com.mokamrp.privates.utils.StringUtils;
+import jdk.nashorn.internal.objects.annotations.Where;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -163,6 +165,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         Integer gender = handle.getGender();
         Integer groupId = handle.getGroupId();
         String mobile = handle.getMobile();
+        Integer privateTagId = handle.getPrivateTagId();
 
         QueryWrapper<WorkEmployeeVo> obj = new QueryWrapper<WorkEmployeeVo>();
 
@@ -176,11 +179,14 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
             obj.eq("A.gender", gender);
         }
 
+        if (privateTagId != null) {
+            obj.eq("A.private_tag_id", privateTagId);
+        }
+
         if (groupId != null) {
             obj.eq("D.group_id", groupId);
         }
 
-
         if (mobile != null) {
             obj.eq("A.mobile", mobile);
         }
@@ -238,4 +244,17 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
 
     }
 
+    /**
+     * 设置客服标签
+     * @param tagId
+     * @param employeeIds
+     * @return
+     */
+    public boolean setTag(Integer tagId,List<Integer> employeeIds){
+        WorkEmployee workEmployee = new WorkEmployee();
+        workEmployee.setPrivateTagId(tagId);
+        this.update(workEmployee,new UpdateWrapper<WorkEmployee>().in("id",employeeIds));
+        return true;
+    }
+
 }