增加客服标签相关接口

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

@@ -1,9 +1,17 @@
 package com.mokamrp.privates.controller;
 
+import com.mokamrp.privates.entity.GetEmployeeTagHandle;
+import com.mokamrp.privates.service.TagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import com.mokamrp.privates.mapper.pojo.Tag;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 标签 前端控制器
@@ -15,6 +23,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/tag")
 public class TagController extends BaseController<Tag>{
+    @Autowired
+    public TagService tagService;
 
+    @PostMapping("/getEmployeeTag")
+    public Object getEmployeeTag(@Valid @RequestBody GetEmployeeTagHandle getEmployeeTagHandle, BindingResult bindingResult){
+        Object res = tagService.selectEmployeeTag(getEmployeeTagHandle);
+        return res;
+    }
 }
 

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

@@ -0,0 +1,13 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+@Data
+public class GetEmployeeTagHandle {
+
+    private String tagName;
+    private Integer tagGroupId;
+    private Integer status;
+
+
+}

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

@@ -1,7 +1,12 @@
 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 org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -11,6 +16,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author gy
  * @since 2021-04-20
  */
+@Component
 public interface TagMapper extends BaseMapper<Tag> {
-
+    List<Map<String,Object>> selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle);
 }

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

@@ -22,4 +22,18 @@
         id, tag_group_id, tag_name, status, tag_type, weight, createtime, updatetime
     </sql>
 
+    <select id="selectEmployeeTag" parameterType="com.mokamrp.privates.entity.GetEmployeeTagHandle" resultType="map">
+        SELECT A.tag_name,IFNULL(B.group_name,'') group_name,A.`status` FROM private_tag AS A
+        LEFT JOIN private_group AS B ON A.tag_group_id = B.id AND B.group_type = 4
+        <where>
+            and A.tag_type = 'EMP0001'
+            <if test="tagName != null">and A.tag_name like %{#tagName}%</if>
+            <if test="tagGroupId != null">and B.id = {#id}</if>
+            <if test="status != null">and A.status = {#status}</if>
+        </where>
+    </select>
+
+
+
+
 </mapper>

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

@@ -1,5 +1,6 @@
 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.mokamrp.privates.entity.IndexHandle;
@@ -21,4 +22,6 @@ public interface TagService extends IService<Tag> {
      * @since 1949-10-01
      */
     public IndexBaseRes<Tag> base(IndexHandle indexhandle);
+
+    public Object selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle);
 }

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

@@ -3,10 +3,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.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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mokamrp.privates.entity.IndexHandle;
 import com.mokamrp.privates.mapper.pojo.IndexBaseRes;
@@ -24,6 +26,9 @@ import java.util.Map;
  */
 @Service
 public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
+
+    @Autowired
+    public TagMapper tagMapper;
     /**
      * 基础sql操作方法
      * @author leon 支持分页offset,limit;简单条件like,=,<>;排序order,sort
@@ -68,4 +73,9 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagSe
         result.setTotal(total);
         return result;
     }
+
+    public Object selectEmployeeTag(GetEmployeeTagHandle getEmployeeTagHandle){
+        Object res = tagMapper.selectEmployeeTag(getEmployeeTagHandle);
+        return res;
+    }
 }

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

@@ -35,7 +35,7 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     private GroupMapper groupMapper;
 
     public Object selectWorkEmployeeList(Integer authUserId, WorkEmployeeHandle workEmployee){
-        List<UserCorp> userCorps = userCorpService.selectList(new EntityWrapper<UserCorp>().eq("id",authUserId));
+        List<UserCorp> userCorps = userCorpService.selectList(new EntityWrapper<UserCorp>().eq("user_id",authUserId));
         //.先用户当前的企业查询企业
         List<Integer> corpIds = new ArrayList<Integer>();
         if (workEmployee.getCorpId() == null){