Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,8 @@
 package com.mokamrp.privates.controller;
 
 import com.mokamrp.privates.constant.HttpStatus;
+import com.mokamrp.privates.entity.GetWorkRoomHandle;
+import com.mokamrp.privates.entity.PostWorkEmployee;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.interceptor.AuthUser;
@@ -8,23 +10,21 @@ 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.service.UserCorpService;
+import com.mokamrp.privates.service.WorkContactEmployeeService;
 import com.xxl.sso.core.conf.Conf;
 import com.xxl.sso.core.user.XxlSsoUser;
 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 org.springframework.web.bind.annotation.*;
 import com.mokamrp.privates.service.WorkEmployeeService;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 
-import org.springframework.web.bind.annotation.RestController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.swing.border.EtchedBorder;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,12 +44,13 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
     @Autowired
     public UserCorpService userCorpService;
 
+    @Autowired
+    public WorkContactEmployeeService workContactEmployeeService;
     /*
      * @fast
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
      * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
-
     @PostMapping("/getWorkEmployeeList")
     public Object getWorkEmployeeList(@Valid @RequestBody WorkEmployeeHandle workEmployee, @AuthUser User authUser,
                                       BindingResult bindingResult,HttpServletRequest request) {
@@ -65,5 +66,31 @@ public class WorkEmployeeController extends BaseController<WorkEmployee> {
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/list")
+    @ResponseBody
+    public Object getList(
+            @AuthUser User authUser,
+            @Valid @RequestBody PostWorkEmployee 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());
+        if (corpIds.size() <= 0) {
+            return AjaxResult.error(HttpStatus.ERROR, UserCorpService.USER_MSG);
+        }
+
+        handle.setAuthCorpIds(corpIds);
+        Map<String, Object> resMap = workEmployeeService.getPageList(handle);//所有
+
+        return AjaxResult.success(resMap);
+
+    }
+
+
 }
 

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

@@ -0,0 +1,19 @@
+package com.mokamrp.privates.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.util.List;
+
+@Data
+public class PostWorkEmployee {
+    @Min(value = 1,message = "页码错误")
+    private Integer pagesize;
+    @Min(value = 1,message = "页码错误")
+    private Integer page;
+    private String name;
+    private Integer corpId;
+    private List<Integer> authCorpIds;
+    private Integer gender;
+    private Integer groupId;
+}

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.getInteger(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/WorkContactEmployeeMapper.java

@@ -8,6 +8,7 @@ import com.mokamrp.privates.mapper.pojo.WorkContactEmployee;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mokamrp.privates.mapper.vo.WorkContactEmployeeVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -19,6 +20,7 @@ import java.util.List;
  * @author gengyang
  * @since 2021-04-17
  */
+@Component
 public interface WorkContactEmployeeMapper extends BaseMapper<WorkContactEmployee> {
 
     List<WorkContactEmployeeVo> getVoList(Page<WorkContactEmployeeVo> page, @Param("ew") QueryWrapper<WorkContactEmployee> queryWrapper);

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

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mokamrp.privates.mapper.WorkContactRoomMapper">
 
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkContactRoom">
         <id column="id" property="id"/>

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

@@ -1,7 +1,14 @@
 package com.mokamrp.privates.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WorkEmployeeMapper extends BaseMapper<WorkEmployee> {
 
+    List<WorkEmployeeVo> getVoList(IPage<WorkEmployeeVo> page, @Param("ew") QueryWrapper<WorkEmployeeVo> queryWrapper);
+
+    Integer getVoListTotal(@Param("ew") QueryWrapper<WorkEmployeeVo> queryWrapper);
+
 }

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

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.mokamrp.privates.mapper.WorkEmployeeMapper">
 
-    <!-- 开启二级缓存 -->
-    <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/>
-
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.mokamrp.privates.mapper.pojo.WorkEmployee">
         <id column="id" property="id"/>
@@ -41,4 +38,49 @@
         , wx_user_id, corp_id, name, mobile, position, gender, email, avatar, thumb_avatar, telephone, alias, extattr, status, qr_code, external_profile, external_position, address, open_user_id, wx_main_department_id, main_department_id, log_user_id, contact_auth, created_at, updated_at, deleted_at
     </sql>
 
+    <select id="getVoList" resultType="com.mokamrp.privates.mapper.vo.WorkEmployeeVo">
+        SELECT
+            A.id,
+            B.group_name,
+            A.`name`,
+            A.gender,
+            A.avatar,
+            A.qr_code,
+            A.mobile,
+            A.private_switch_status,
+            A.private_tag_id,
+            A.private_phone_code,
+            A.private_forbidden_status,
+            A.private_user_id,
+            A.cust_cnt,
+            A.group_cnt,
+            A.in_group_cnt,
+            C.`name` AS companyName,
+            D.group_id
+        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
+        <where>
+            ${ew.sqlSegment}
+        </where>
+  </select>
+
+
+    <select id="getVoListTotal" resultType="Integer">
+
+        SELECT
+            count(*)
+        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
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+
 </mapper>

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

@@ -10,6 +10,7 @@ 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;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -21,6 +22,7 @@ import java.util.List;
  * @author gy
  * @since 2021-04-21
  */
+@Component
 public interface WorkRoomMapper extends BaseMapper<WorkRoom> {
     List<WorkRoomVo> getVoList(IPage<WorkRoomVo> page, @Param("ew") QueryWrapper<WorkRoomVo> queryWrapper);
 

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

@@ -0,0 +1,177 @@
+package com.mokamrp.privates.mapper.vo;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 通讯录 - 客户 中间表
+ * </p>
+ *
+ * @author gengyang
+ * @since 2021-04-17
+ */
+public class WorkEmployeeVo {
+
+    private Integer id;
+    private String groupName;
+    private String name;
+    private Integer gender;
+    private String avatar;
+    private String qrCode;
+    private String mobile;
+    private Integer privateSwitchStatus;
+    private Integer privateTagId;
+    private String privatePhoneCode;
+    private Integer privateForbiddenStatus;
+    private Integer privateUserId;
+    private Integer custCnt;
+    private Integer groupCnt;
+    private Integer inGroupCnt;
+    private String companyName;
+    private Object roomNum;
+    private Object fanNum;
+
+    public Object getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(Object roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public Object getFanNum() {
+        return fanNum;
+    }
+
+    public void setFanNum(Object fanNum) {
+        this.fanNum = fanNum;
+    }
+
+    public Object getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getGender() {
+        return gender;
+    }
+
+    public void setGender(Integer gender) {
+        this.gender = gender;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+
+    public void setQr_code(String qrCode) {
+        this.qrCode = qrCode;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getPrivateSwitchStatus() {
+        return privateSwitchStatus;
+    }
+
+    public void setPrivateSwitchStatus(Integer privateSwitchStatus) {
+        this.privateSwitchStatus = privateSwitchStatus;
+    }
+
+    public Integer getPrivateTagId() {
+        return privateTagId;
+    }
+
+    public void setPrivateTagId(Integer privateTagId) {
+        this.privateTagId = privateTagId;
+    }
+
+    public String getPrivatePhoneCode() {
+        return privatePhoneCode;
+    }
+
+    public void setPrivatePhoneCode(String privatePhoneCode) {
+        this.privatePhoneCode = privatePhoneCode;
+    }
+
+    public Integer getPrivateForbiddenStatus() {
+        return privateForbiddenStatus;
+    }
+
+    public void setPrivateForbiddenStatus(Integer privateForbiddenStatus) {
+        this.privateForbiddenStatus = privateForbiddenStatus;
+    }
+
+    public Integer getPrivateUserId() {
+        return privateUserId;
+    }
+
+    public void setPrivateUserId(Integer privateUserId) {
+        this.privateUserId = privateUserId;
+    }
+
+    public Integer getCustCnt() {
+        return custCnt;
+    }
+
+    public void setCustCnt(Integer custCnt) {
+        this.custCnt = custCnt;
+    }
+
+    public Integer getGroupCnt() {
+        return groupCnt;
+    }
+
+    public void setGroupCnt(Integer groupCnt) {
+        this.groupCnt = groupCnt;
+    }
+
+    public Integer getInGroupCnt() {
+        return inGroupCnt;
+    }
+
+    public void setInGroupCnt(Integer inGroupCnt) {
+        this.inGroupCnt = inGroupCnt;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

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

@@ -1,11 +1,15 @@
 package com.mokamrp.privates.service;
 
+import com.mokamrp.privates.entity.GetWorkRoomHandle;
+import com.mokamrp.privates.entity.PostWorkEmployee;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
+import com.mokamrp.privates.mapper.pojo.Downfile;
 import com.mokamrp.privates.mapper.pojo.UserCorp;
 import com.mokamrp.privates.mapper.pojo.WorkEmployee;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +21,8 @@ import java.util.List;
  */
 public interface WorkEmployeeService extends IService<WorkEmployee> {
     public Object selectWorkEmployeeList(String authUserId, WorkEmployeeHandle workEmployee);
+
+    public Map<String, Object> getPageList(PostWorkEmployee handle);
+
+    public void export(Downfile downFile, PostWorkEmployee handle);
 }

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

@@ -1,21 +1,29 @@
 package com.mokamrp.privates.service.impl;
 
+import com.aliyun.oss.model.PutObjectRequest;
+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.GetWorkRoomHandle;
+import com.mokamrp.privates.entity.PostWorkEmployee;
 import com.mokamrp.privates.entity.WorkEmployeeHandle;
-import com.mokamrp.privates.mapper.GroupCorpMapper;
-import com.mokamrp.privates.mapper.GroupMapper;
-import com.mokamrp.privates.mapper.pojo.UserCorp;
-import com.mokamrp.privates.mapper.pojo.WorkEmployee;
-import com.mokamrp.privates.mapper.WorkEmployeeMapper;
+import com.mokamrp.privates.mapper.*;
+import com.mokamrp.privates.mapper.pojo.*;
+import com.mokamrp.privates.mapper.vo.WorkEmployeeVo;
+import com.mokamrp.privates.mapper.vo.WorkRoomVo;
 import com.mokamrp.privates.service.UserCorpService;
 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 org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.io.ByteArrayInputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -32,6 +40,15 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
     @Autowired
     private GroupMapper groupMapper;
 
+    @Autowired
+    private WorkContactEmployeeMapper workContactEmployeeMapper;
+
+    @Autowired
+    private WorkEmployeeMapper workEmployeeMapper;
+
+    @Autowired
+    private WorkRoomMapper workRoomMapper;
+
     public Object selectWorkEmployeeList(String authUserId, WorkEmployeeHandle workEmployee) {
         List<Integer> userCorpIds = userCorpService.getAuthUserCorpIds(authUserId);
         List<Integer> corpIds = new ArrayList<Integer>();
@@ -44,4 +61,101 @@ public class WorkEmployeeServiceImpl extends ServiceImpl<WorkEmployeeMapper, Wor
         List<Map<String, Object>> res = groupMapper.selectCorpAndWorkEmployeeList(corpIdStr);
         return res;
     }
+
+
+    @Override
+    public Map<String, Object> getPageList(PostWorkEmployee handle) {
+
+        Integer pagesize = handle.getPagesize();
+        Integer page = handle.getPage();
+        Page<WorkEmployeeVo> pageObj = new Page<>(page, pagesize);
+        Map<String, Object> resMap = new HashMap<String, Object>();
+        resMap.put("list", null);
+        resMap.put("total", 0);
+
+        QueryWrapper<WorkEmployeeVo> obj = getWrapper(handle);
+
+        Integer total = workEmployeeMapper.getVoListTotal(obj);
+        resMap.put("total", total);
+        if(total <=0){
+            return resMap;
+        }
+
+        List<WorkEmployeeVo> list = getCommonList(pageObj, obj);
+        resMap.put("list", list);
+        return resMap;
+
+    }
+
+    @Override
+    public void export(Downfile downFile, PostWorkEmployee handle) {
+
+        return;
+    }
+
+    private QueryWrapper<WorkEmployeeVo> getWrapper(PostWorkEmployee handle) {
+        String name = handle.getName();
+        Integer corp_id = handle.getCorpId();
+        List<Integer> authCorpIds = handle.getAuthCorpIds();
+        QueryWrapper<WorkEmployeeVo> obj = new QueryWrapper<WorkEmployeeVo>();
+
+        obj.in("a.corp_id", authCorpIds);
+
+        if (name != null && !"".equals(name)) {
+            obj.like("a.name", name);
+        }
+
+        if (corp_id != null) {
+            obj.eq("a.corp_id", corp_id);
+        }
+
+        if (authCorpIds != null || authCorpIds.size()>=1) {
+            obj.in("a.corp_id", authCorpIds);
+        }
+
+        return obj;
+    }
+
+    private List<WorkEmployeeVo> getCommonList(Page<WorkEmployeeVo> pageObj, QueryWrapper<WorkEmployeeVo> room) {
+
+        QueryWrapper<WorkContactEmployee> obj = new QueryWrapper<WorkContactEmployee>();
+        QueryWrapper<WorkRoom> roomObj = new QueryWrapper<WorkRoom>();
+        List<WorkEmployeeVo> list = workEmployeeMapper.getVoList(pageObj, room);
+
+        int j =list.size();
+
+        if (j > 0) {
+            List<Object> ids = list.stream().map(WorkEmployeeVo -> WorkEmployeeVo.getId()).collect(Collectors.toList());
+
+            obj.select("count(*) as nums,employee_id").in("employee_id",ids).groupBy("employee_id");
+            List<Map<String,Object>> contactList= workContactEmployeeMapper.selectMaps(obj);
+
+            roomObj.select("count(*) as nums,owner_id").in("owner_id",ids).groupBy("owner_id");
+            List<Map<String,Object>> roomList = workRoomMapper.selectMaps(roomObj);
+
+            Object id;
+            for (int i = 0; i < j; i++) {
+                id = list.get(i).getId();
+                list.get(i).setRoomNum(0);
+                list.get(i).setFanNum(0);
+                for (Map<String,Object> r:roomList
+                ) {
+                    if(r.get("owner_id").toString().equals(id.toString())){
+                        list.get(i).setRoomNum(r.get("nums"));
+                    }
+                }
+
+                for (Map<String,Object> contact:contactList
+                ) {
+                    if(contact.get("employee_id").toString().equals(id.toString())){
+                        list.get(i).setFanNum(contact.get("nums"));
+                    }
+                }
+            }
+        }
+
+        return list;
+
+    }
+
 }

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

@@ -64,8 +64,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
         Integer pagesize = handle.getPagesize();
         Integer page = handle.getPage();
         Page<WorkRoomVo> pageObj = new Page<>(page, pagesize);
-        System.out.println(page);
-        System.out.println(pagesize);
         Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("list", null);
         resMap.put("total", 0);
@@ -80,7 +78,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
             return resMap;
         }
 
-        System.out.println("当前数量是"+total);
         List<WorkRoomVo> list = getCommonList(pageObj, obj);
 
         resMap.put("list", list);
@@ -146,7 +143,6 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
 
     private List<WorkRoomVo> getCommonList(Page<WorkRoomVo> pageObj, QueryWrapper<WorkRoomVo> room) {
 
-        System.out.println(pageObj);
         List<WorkRoomVo> list = mapperObj.getVoList(pageObj, room);
 
         System.out.println("获取数量是"+list.size());
@@ -204,18 +200,14 @@ public class WorkRoomServiceImpl extends ServiceImpl<WorkRoomMapper, WorkRoom> i
             obj.le("a.create_time", end_create_time);
         }
 
-        if (owner_id != null) {
+        if (owner_id != null && owner_id.size() >=1) {
             obj.in("a.owner_id", owner_id);
         }
 
-        if (tag_id != null) {
+        if (tag_id != null && tag_id.size() >=1) {
             obj.in("f.tag_id", tag_id);
         }
 
-        if (corp_id != null) {
-            obj.eq("a.corp_id", owner_id);
-        }
-
         if (corp_group_id != null) {
             obj.eq("c.group_id", corp_group_id);
         }