新增盘古相关功能

src/main/java/com/mokamrp/privates/constant/RedisKey.java

@@ -18,7 +18,7 @@ public class RedisKey {
     //.盘古客服信息 HASH
     public static final String PanCustServiceInfo = "pan_custservice_info";
     //.盘古活码二级域名列表 SET
-    public static final String PanSecondDomainList = "pan_second_domain_list";
+    public static final String PanSecondDomainList = "pan_second_domain_list:";
     //.盘古活码详细信息
     public static final String PanPromoteCodeInfo = "pan_promote_code_info";
     //.检测微信环境域名状态第三方登录token

src/main/java/com/mokamrp/privates/controller/pangu/CustserviceGroupController.java

@@ -1,10 +1,16 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
+import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
 import com.mokamrp.privates.entity.pangu.CustserviceListHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.User;
 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;
@@ -38,10 +44,30 @@ public class CustserviceGroupController extends BaseController<CustserviceGroup>
      */
 
     @PostMapping("/list")
-    public Object list(@RequestBody CustserviceGroupListHandle custserviceGroupListHandle){
-        Object res = custserviceGroupService.getlist(custserviceGroupListHandle);
+    public Object list(@RequestBody CustserviceGroupListHandle custserviceGroupListHandle,@AuthUser User authUser){
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = custserviceGroupService.getlist(custserviceGroupListHandle,null);
+        }else{
+            res = custserviceGroupService.getlist(custserviceGroupListHandle,authUser.getDepartment());
+        }
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<CustserviceGroup> addHandle, @AuthUser User authUser, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        addHandle.getRaw().setDeptId(authUser.getDepartment());
+        this.onInsert(addHandle.getRaw());
+        Boolean res = service.save(addHandle.getRaw());
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/DomainFirstController.java

@@ -1,7 +1,19 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
+import com.mokamrp.privates.entity.AddHandle;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pangu.pojo.CustserviceGroup;
+import com.mokamrp.privates.mapper.pojo.User;
 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.service.pangu.DomainFirstService;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
@@ -31,7 +43,31 @@ public class DomainFirstController extends BaseController<DomainFirst> {
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
      * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
+    @PostMapping("/list")
+    public Object list(@RequestBody PostBasePageHandle postBasePageHandle, @AuthUser User authUser){
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = domainFirstService.getlist(postBasePageHandle,null);
+        }else{
+            res = domainFirstService.getlist(postBasePageHandle,authUser.getDepartment());
+        }
+        return AjaxResult.success(res);
+    }
 
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<DomainFirst> addHandle, @AuthUser User authUser, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        addHandle.getRaw().setDeptId(authUser.getDepartment());
+        this.onInsert(addHandle.getRaw());
+        Boolean res = service.save(addHandle.getRaw());
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
 
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/DomainSecondController.java

@@ -7,7 +7,10 @@ import com.mokamrp.privates.constant.RedisKey;
 import com.mokamrp.privates.controller.BaseController;
 import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.DelHandle;
+import com.mokamrp.privates.entity.PostBasePageHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pojo.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.validation.BindingResult;
@@ -46,16 +49,25 @@ public class DomainSecondController extends BaseController<DomainSecond> {
      * 默认生成的控制器所继承的父类中有index/add/edit/del四个基础方法,均为post json请求
      * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
-
-    @PostMapping("/del")
-    public Object delete(@Valid @RequestBody DelHandle<DomainSecond> delHandle, BindingResult bindingResult) {
+    @PostMapping("/list")
+    public Object list(@RequestBody PostBasePageHandle postBasePageHandle, @AuthUser User authUser){
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = domainSecondService.getlist(postBasePageHandle,null);
+        }else{
+            res = domainSecondService.getlist(postBasePageHandle,authUser.getDepartment());
+        }
+        return AjaxResult.success(res);
+    }
+    @PostMapping("/delPro")
+    public Object deletePro(@Valid @RequestBody DelHandle<DomainSecond> delHandle,@AuthUser User authUser, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
         QueryWrapper<DomainSecond> QueryWrapper = new QueryWrapper<>();
         String[] ids = delHandle.getIds().split(",");
         QueryWrapper.in("id", ids);
-        this.delRedis(ids);
+        this.delRedis(ids,authUser.getDepartment());
         boolean res = service.remove(QueryWrapper);
         if (!res) {
             return AjaxResult.error("删除失败");
@@ -63,30 +75,31 @@ public class DomainSecondController extends BaseController<DomainSecond> {
         return AjaxResult.success(Constants.SUCCESS, res);
     }
 
-    @PostMapping("/add")
-    public Object add(@Valid @RequestBody AddHandle<DomainSecond> addHandle, BindingResult bindingResult) {
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<DomainSecond> addHandle, @AuthUser User authUser, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
+        addHandle.getRaw().setDeptId(authUser.getDepartment());
         this.onInsert(addHandle.getRaw());
         Boolean res = service.save(addHandle.getRaw());
         if (res) {
-            this.addRedis(addHandle.getRaw().getDomain());
+            this.addRedis(addHandle.getRaw().getDomain(),addHandle.getRaw().getDeptId());
             return AjaxResult.success(Constants.SUCCESS, res);
         } else {
             return AjaxResult.error("新增失败", res);
         }
     }
 
-    public Boolean addRedis(String domain){
-        stringRedisTemplate.opsForSet().add(RedisKey.PanSecondDomainList,domain);
+    public Boolean addRedis(String domain,String deptId){
+        stringRedisTemplate.opsForSet().add(RedisKey.PanSecondDomainList+deptId,domain);
         return true;
     }
 
-    public Boolean delRedis(String[] ids){
+    public Boolean delRedis(String[] ids,String deptId){
         List<DomainSecond> list = domainSecondService.list(new QueryWrapper<DomainSecond>().in("id",ids));
         for (DomainSecond domainSecond : list){
-            stringRedisTemplate.opsForSet().remove(RedisKey.PanSecondDomainList,domainSecond.getDomain());
+            stringRedisTemplate.opsForSet().remove(RedisKey.PanSecondDomainList+deptId,domainSecond.getDomain());
         }
         return true;
     }

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileWxfriendController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mokamrp.privates.constant.HttpMsg;
 import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.entity.pangu.AddFosterwxMobileHandle;
 import com.mokamrp.privates.help.AjaxResult;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
@@ -78,22 +79,9 @@ public class FosterwxMobileWxfriendController extends BaseController<FosterwxMob
             return AjaxResult.error(HttpMsg.error);
         }
         //.判断好友微信名称是否同样的超过3个
-        FosterwxMobile fosterwxMobile = fosterwxMobileService.getOne(new QueryWrapper<FosterwxMobile>().eq("id",addFosterwxMobileHandle.getMobileId()));
-        List<FosterwxMobile> mobileList = fosterwxMobileService.list(new QueryWrapper<FosterwxMobile>().eq("station_id",fosterwxMobile.getStationId()));
-        List<Integer> mobileIds = mobileList.stream().map(FosterwxMobile::getId).collect(Collectors.toList());
-        List<FosterwxMobileWxfriend> friends = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
-                .in("mobile_id",mobileIds)
-        );
-        Map<String,Boolean> friendsNames = new HashMap<>();
-        for (FosterwxMobileWxfriend add :addFosterwxMobileHandle.getFriends()){
-            if(friendsNames.get(add.getWxName()) != null){
-                return AjaxResult.error(HttpMsg.wxFriendResume+add.getWxName());
-            }
-            friendsNames.put(add.getWxName(),true);
-            Boolean findRes = this.checkWxFriendCnt(friends,add.getWxName());
-            if (!findRes){
-                return AjaxResult.error(HttpMsg.wxFriendCntMax3+add.getWxName());
-            }
+        VoltaHandle<String> res = fosterwxMobileWxfriendService.checkFriend(addFosterwxMobileHandle);
+        if(res.getErr() != null){
+            return AjaxResult.error(res.getErr());
         }
         fosterwxMobileWxfriendService.removeAndAdd(addFosterwxMobileHandle);
         return AjaxResult.success();
@@ -118,23 +106,10 @@ public class FosterwxMobileWxfriendController extends BaseController<FosterwxMob
         if (addFosterwxMobileHandle.getFriends() == null || addFosterwxMobileHandle.getFriends().size() <= 0){
             return AjaxResult.error(HttpMsg.error);
         }
-        //.判断好友微信名称是否同样的超过3个
-        FosterwxMobile fosterwxMobile = fosterwxMobileService.getOne(new QueryWrapper<FosterwxMobile>().eq("id",addFosterwxMobileHandle.getMobileId()));
-        List<FosterwxMobile> mobileList = fosterwxMobileService.list(new QueryWrapper<FosterwxMobile>().eq("station_id",fosterwxMobile.getStationId()));
-        List<Integer> mobileIds = mobileList.stream().map(FosterwxMobile::getId).collect(Collectors.toList());
-        List<FosterwxMobileWxfriend> friends = fosterwxMobileWxfriendService.list(new QueryWrapper<FosterwxMobileWxfriend>()
-             .in("mobile_id",mobileIds)
-        );
-        Map<String,Boolean> friendsNames = new HashMap<>();
-        for (FosterwxMobileWxfriend add :addFosterwxMobileHandle.getFriends()){
-            if(friendsNames.get(add.getWxName()) != null){
-                return AjaxResult.error(HttpMsg.wxFriendResume+add.getWxName());
-            }
-            friendsNames.put(add.getWxName(),true);
-            Boolean findRes = this.checkWxFriendCnt(friends,add.getWxName());
-            if (!findRes){
-                return AjaxResult.error(HttpMsg.wxFriendCntMax3+add.getWxName());
-            }
+        //.好友验证
+        VoltaHandle<String> res = fosterwxMobileWxfriendService.checkFriend(addFosterwxMobileHandle);
+        if(res.getErr() != null){
+            return AjaxResult.error(res.getErr());
         }
         //.登录验证
         FosterwxStation fosterwxStation = fosterwxStationService.getAuthInfo(token);
@@ -144,18 +119,5 @@ public class FosterwxMobileWxfriendController extends BaseController<FosterwxMob
         fosterwxMobileWxfriendService.removeAndAdd(addFosterwxMobileHandle);
         return AjaxResult.success();
     }
-
-    private Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,String wxName){
-        Integer findCnt = 0;
-        for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row){
-            if (fosterwxMobileWxfriend.getWxName().equals(wxName)){
-                findCnt++;
-            }
-            if (findCnt >= 3){
-                return false;
-            }
-        }
-        return true;
-    }
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/PlaybillGroupController.java

@@ -1,10 +1,17 @@
 package com.mokamrp.privates.controller.pangu;
 
+import com.mokamrp.privates.constant.Constants;
+import com.mokamrp.privates.constant.HttpStatus;
 import com.mokamrp.privates.controller.BaseController;
+import com.mokamrp.privates.entity.AddHandle;
 import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
 import com.mokamrp.privates.entity.pangu.PlaybillGroupListHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
+import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
+import com.mokamrp.privates.mapper.pojo.User;
 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;
@@ -37,10 +44,30 @@ public class PlaybillGroupController extends BaseController<PlaybillGroup> {
      * 如果需要定制化，需要将BaseController中对应的方法复制到当前控制器,然后进行修改
      */
     @PostMapping("/list")
-    public Object list(@RequestBody PlaybillGroupListHandle playbillGroupListHandle){
-        Object res = playbillGroupService.getlist(playbillGroupListHandle);
+    public Object list(@RequestBody PlaybillGroupListHandle playbillGroupListHandle,@AuthUser User authUser){
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = playbillGroupService.getlist(playbillGroupListHandle,null);
+        }else{
+            res = playbillGroupService.getlist(playbillGroupListHandle,authUser.getDepartment());
+        }
         return AjaxResult.success(res);
     }
 
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<PlaybillGroup> addHandle, @AuthUser User authUser, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
+        }
+        addHandle.getRaw().setDeptId(authUser.getDepartment());
+        this.onInsert(addHandle.getRaw());
+        Boolean res = service.save(addHandle.getRaw());
+        if (res) {
+            return AjaxResult.success(Constants.SUCCESS, res);
+        } else {
+            return AjaxResult.error("新增失败", res);
+        }
+    }
+
 }
 

src/main/java/com/mokamrp/privates/controller/pangu/PromoteCodeController.java

@@ -12,7 +12,9 @@ import com.mokamrp.privates.entity.DelHandle;
 import com.mokamrp.privates.entity.EditHandle;
 import com.mokamrp.privates.entity.pangu.PromoteCodeListHandle;
 import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.interceptor.AuthUser;
 import com.mokamrp.privates.mapper.pangu.pojo.PromoteQrcodePool;
+import com.mokamrp.privates.mapper.pojo.User;
 import com.mokamrp.privates.service.pangu.PromoteQrcodePoolService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -62,21 +64,20 @@ public class PromoteCodeController extends BaseController<PromoteCode> {
         return AjaxResult.success(Constants.SUCCESS, res);
     }
 
-    @Override
-    @PostMapping("/add")
-    public Object add(@Valid @RequestBody AddHandle<PromoteCode> addHandle, BindingResult bindingResult) {
+    @PostMapping("/addPro")
+    public Object addPro(@Valid @RequestBody AddHandle<PromoteCode> addHandle, @AuthUser User authUser, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return AjaxResult.error(HttpStatus.ERROR, bindingResult.getFieldError().getDefaultMessage());
         }
+        addHandle.getRaw().setDeptId(authUser.getDepartment());
         this.onInsert(addHandle.getRaw());
-        Map<String, Object> res = promoteCodeService.add(addHandle.getRaw());
-        if (res.get("err") == null) {
+        Boolean res = promoteCodeService.save(addHandle.getRaw());
+        if (res){
             this.sync();
             return AjaxResult.success(Constants.SUCCESS, res);
-        } else if (res.get("err").equals("noFirst")) {
-            return AjaxResult.error("一级域名可用数量不足");
+        }else{
+            return AjaxResult.error("新增失败");
         }
-        return AjaxResult.success(Constants.SUCCESS, res);
     }
 
     @PostMapping("/del")
@@ -118,8 +119,13 @@ public class PromoteCodeController extends BaseController<PromoteCode> {
     }
 
     @PostMapping("/list")
-    public Object list(@RequestBody PromoteCodeListHandle promoteCodeListHandle) {
-        Object res = promoteCodeService.getlist(promoteCodeListHandle);
+    public Object list(@RequestBody PromoteCodeListHandle promoteCodeListHandle,@AuthUser User authUser) {
+        Object res;
+        if (authUser.getIsSuperAdmin().equals(1)){
+            res = promoteCodeService.getlist(promoteCodeListHandle,null);
+        }else{
+            res = promoteCodeService.getlist(promoteCodeListHandle,authUser.getDepartment());
+        }
         return AjaxResult.success(res);
     }
 

src/main/java/com/mokamrp/privates/entity/pangu/CustserviceGroupListHandle.java

@@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank;
  * @author leon 通用新增请求实体类
  */
 @Data
-public class CustserviceGroupListHandle<T> {
+public class CustserviceGroupListHandle {
     @NotBlank(message = "page 不可为空")
     private Integer page;
     @NotBlank(message = "pagesize 不可为空")

src/main/java/com/mokamrp/privates/entity/pangu/PlaybillGroupListHandle.java

@@ -5,11 +5,10 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 /**
- * @param <T>
  * @author leon 通用新增请求实体类
  */
 @Data
-public class PlaybillGroupListHandle<T> {
+public class PlaybillGroupListHandle {
     @NotBlank(message = "page 不可为空")
     private Integer page;
     @NotBlank(message = "pagesize 不可为空")

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

@@ -62,6 +62,9 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
         user.setId(Integer.valueOf(plugininfo.get("employeeNo")));
         user.setName(xxlSsoUser.getUsername());
         user.setUserId(xxlSsoUser.getUserid());
+//        user.setDepartment(plugininfo.get("department"));
+        user.setDepartment("cc6f12ebd6c2ca1c");
+        user.setPic(plugininfo.get("pic"));
         String roles = plugininfo.get("roles");
         //.检查用户角色信息
         user.setIsSuperAdmin(0);

src/main/java/com/mokamrp/privates/mapper/pangu/CustserviceGroupMapper.java

@@ -18,5 +18,5 @@ import java.util.List;
  * @since 2021-06-11
  */
 public interface CustserviceGroupMapper extends BaseMapper<CustserviceGroup> {
-    public List<CustserviceGroup> getlist(IPage<CustserviceGroup> page);
+    public List<CustserviceGroup> getlist(IPage<CustserviceGroup> page,@Param("deptId") String deptId);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/CustserviceGroupMapper.xml

@@ -16,7 +16,12 @@
     </sql>
     <select id="getlist" resultType="com.mokamrp.privates.mapper.pangu.pojo.CustserviceGroup">
         SELECT A.*,B.custservice_cnt,B.group_id FROM pan_custservice_group AS A
-        LEFT JOIN (SELECT COUNT(id) AS custservice_cnt,group_id from pan_custservice GROUP BY group_id) AS B ON A.id = B.group_id
+        LEFT JOIN (SELECT COUNT(id) AS custservice_cnt,group_id from pan_custservice
+        GROUP BY group_id) AS B ON A.id = B.group_id
+        <where>
+            <if test="deptId != null">and A.dept_id = #{deptId}</if>
+        </where>
+
     </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/DomainFirstMapper.java

@@ -1,7 +1,12 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mokamrp.privates.mapper.pangu.pojo.CustserviceGroup;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-06-15
  */
 public interface DomainFirstMapper extends BaseMapper<DomainFirst> {
-
+    public List<DomainFirst> getlist(IPage<DomainFirst> page, @Param("deptId") String deptId);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/DomainFirstMapper.xml

@@ -18,5 +18,12 @@
     <sql id="Base_Column_List">
         id, domain, is_record, status, screen_city, forbbiden_at, create_at, update_at
     </sql>
+    <select id="getlist" resultType="com.mokamrp.privates.mapper.pangu.pojo.DomainFirst">
+        select * from pan_domain_first
+        <where>
+            <if test="deptId != null">and dept_id = #{deptId}</if>
+        </where>
+
+    </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/DomainSecondMapper.java

@@ -1,7 +1,12 @@
 package com.mokamrp.privates.mapper.pangu;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainSecond;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-06-15
  */
 public interface DomainSecondMapper extends BaseMapper<DomainSecond> {
-
+    public List<DomainSecond> getlist(IPage<DomainSecond> page, @Param("deptId") String deptId);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/DomainSecondMapper.xml

@@ -18,5 +18,12 @@
     <sql id="Base_Column_List">
         id, domain, is_record, status, screen_city, forbbiden_at, create_at, update_at
     </sql>
+    <select id="getlist" resultType="com.mokamrp.privates.mapper.pangu.pojo.DomainSecond">
+        select * from pan_domain_second
+        <where>
+            <if test="deptId != null">and dept_id = #{deptId}</if>
+        </where>
+
+    </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/PlaybillGroupMapper.java

@@ -19,5 +19,5 @@ import java.util.List;
  * @since 2021-06-11
  */
 public interface PlaybillGroupMapper extends BaseMapper<PlaybillGroup> {
-    public List<PlaybillGroup> getlist(IPage<PlaybillGroup> page, @Param("playbillGroupListHandle")PlaybillGroupListHandle playbillGroupListHandle);
+    public List<PlaybillGroup> getlist(IPage<PlaybillGroup> page, @Param("playbillGroupListHandle")PlaybillGroupListHandle playbillGroupListHandle,@Param("deptId") String deptId);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/PlaybillGroupMapper.xml

@@ -16,7 +16,11 @@
     </sql>
     <select id="getlist" resultType="com.mokamrp.privates.mapper.pangu.pojo.PlaybillGroup">
         SELECT A.*,B.playbill_cnt,B.group_id FROM pan_playbill_group AS A
-        LEFT JOIN (SELECT COUNT(id) AS playbill_cnt,group_id from pan_playbill GROUP BY group_id) AS B ON A.id = B.group_id
+        LEFT JOIN (SELECT COUNT(id) AS playbill_cnt,group_id from pan_playbill
+        GROUP BY group_id) AS B ON A.id = B.group_id
+        <where>
+            <if test="deptId != null">and A.dept_id = #{deptId}</if>
+        </where>
     </select>
 
 </mapper>

src/main/java/com/mokamrp/privates/mapper/pangu/PromoteCodeMapper.java

@@ -21,7 +21,7 @@ import java.util.List;
  */
 public interface PromoteCodeMapper extends BaseMapper<PromoteCode> {
 
-    public List<PromoteCodeVo> getlist(IPage<PromoteCodeVo> page, @Param("promoteCodeListHandle") PromoteCodeListHandle promoteCodeListHandle);
+    public List<PromoteCodeVo> getlist(IPage<PromoteCodeVo> page, @Param("promoteCodeListHandle") PromoteCodeListHandle promoteCodeListHandle,@Param("deptId") String deptId);
 
     public PromoteCodeVo getInfo(@Param("id") String id);
 }

src/main/java/com/mokamrp/privates/mapper/pangu/PromoteCodeMapper.xml

@@ -30,13 +30,26 @@
         D.qrcode_x AS custservice_qrcode_x,
         D.qrcode_y AS custservice_qrcode_y,
         B1.domain,
+        E.long_touch_uv_total,
+        E.long_touch_pv_total,
+        E.take_qrcode_uv_total,
+        E.take_qrcode_pv_total,
         CONCAT(B1.domain,'/#/dispatch?promoteId=',A.id) AS qrcode
         FROM pan_promote_code AS A
         LEFT JOIN pan_domain_first AS B1 ON A.domain_id = B1.id
         LEFT JOIN pan_domain_second AS B2 ON A.second_domain_id = B2.id
         LEFT JOIN pan_playbill AS C ON A.playbill_id = C.id
         LEFT JOIN pan_playbill as D ON A.custservice_playbill_id = D.id
+        LEFT JOIN (select
+                          sum(long_touch_uv) as long_touch_uv_total,
+                          sum(long_touch_pv) as long_touch_pv_total,
+                          sum(take_qrcode_uv) as take_qrcode_uv_total,
+                          sum(take_qrcode_pv) as take_qrcode_pv_total,
+                          promote_id
+                          from pan_promote_qrcode_pool_record
+                          group by promote_id) as E ON A.id = E.promote_id
         <where>
+            <if test="deptId != null">and A.dept_id = #{deptId}</if>
             <if test="promoteCodeListHandle.name != null">and A.name like CONCAT('%',#{promoteCodeListHandle.name},'%')</if>
             <if test="promoteCodeListHandle.startDate != null">and A.create_at between #{promoteCodeListHandle.startDate} and #{promoteCodeListHandle.endDate}</if>
         </where>

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/CustserviceGroup.java

@@ -25,7 +25,7 @@ public class CustserviceGroup extends Model<CustserviceGroup> {
 
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    private String deptId;
     private String groupName;
 
     private Integer custserviceCnt;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/DomainFirst.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -15,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-06-15
  */
+@Data
 @TableName("pan_domain_first")
 public class DomainFirst extends Model<DomainFirst> {
 
@@ -25,7 +28,7 @@ public class DomainFirst extends Model<DomainFirst> {
      */
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    private String deptId;
     /**
      * 域名
      */

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/DomainSecond.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -15,6 +17,7 @@ import java.io.Serializable;
  * @author leon
  * @since 2021-06-15
  */
+@Data
 @TableName("pan_domain_second")
 public class DomainSecond extends Model<DomainSecond> {
 
@@ -25,7 +28,7 @@ public class DomainSecond extends Model<DomainSecond> {
      */
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    private String deptId;
     /**
      * 域名
      */

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/PlaybillGroup.java

@@ -25,7 +25,7 @@ public class PlaybillGroup extends Model<PlaybillGroup> {
 
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    private String deptId;
     private String groupName;
 
     private Integer playbillCnt;

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/PromoteCode.java

@@ -28,7 +28,7 @@ public class PromoteCode extends Model<PromoteCode> {
      */
       @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
+    private String deptId;
     private String name;
 
     /**

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/PromoteCodeVo.java

@@ -28,6 +28,7 @@ public class PromoteCodeVo extends Model<PromoteCodeVo> {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+    private String deptId;
 
     private String name;
 
@@ -49,12 +50,16 @@ public class PromoteCodeVo extends Model<PromoteCodeVo> {
     /**
      * 扫码pv
      */
-    private Integer takeQrcodePv;
+    private Integer takeQrcodePvTotal;
+
+    private Integer takeQrcodeUvTotal;
 
     /**
      * 长按pv
      */
-    private Integer longTouchPv;
+    private Integer longTouchPvTotal;
+
+    private Integer longTouchUvTotal;
 
     /**
      * 活码全天uv上限
@@ -135,22 +140,6 @@ public class PromoteCodeVo extends Model<PromoteCodeVo> {
     }
 
 
-    public Integer getTakeQrcodePv() {
-        return takeQrcodePv;
-    }
-
-    public void setTakeQrcodePv(Integer takeQrcodePv) {
-        this.takeQrcodePv = takeQrcodePv;
-    }
-
-    public Integer getLongTouchPv() {
-        return longTouchPv;
-    }
-
-    public void setLongTouchPv(Integer longTouchPv) {
-        this.longTouchPv = longTouchPv;
-    }
-
     public Integer getDayUvMax() {
         return dayUvMax;
     }
@@ -188,19 +177,4 @@ public class PromoteCodeVo extends Model<PromoteCodeVo> {
         return this.id;
     }
 
-    @Override
-    public String toString() {
-        return "PromoteCode{" +
-                "id=" + id +
-                ", name=" + name +
-                ", status=" + status +
-                ", domainId=" + domainId +
-                ", takeQrcodePv=" + takeQrcodePv +
-                ", longTouchPv=" + longTouchPv +
-                ", dayUvMax=" + dayUvMax +
-                ", hourUvMax=" + hourUvMax +
-                ", createAt=" + createAt +
-                ", updateAt=" + updateAt +
-                "}";
-    }
 }

src/main/java/com/mokamrp/privates/service/pangu/CustserviceGroupService.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CustserviceGroupService extends IService<CustserviceGroup> {
     //.获取客服分组列表 带分组内客服数量
-    public Object getlist(CustserviceGroupListHandle custserviceGroupListHandle);
+    public Object getlist(CustserviceGroupListHandle custserviceGroupListHandle,String deptId);
 }

src/main/java/com/mokamrp/privates/service/pangu/DomainFirstService.java

@@ -1,5 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-06-15
  */
 public interface DomainFirstService extends IService<DomainFirst> {
-
+    public Object getlist(PostBasePageHandle postBasePageHandle, String deptId);
 }

src/main/java/com/mokamrp/privates/service/pangu/DomainSecondService.java

@@ -1,5 +1,7 @@
 package com.mokamrp.privates.service.pangu;
 
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainSecond;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-06-15
  */
 public interface DomainSecondService extends IService<DomainSecond> {
-
+    public Object getlist(PostBasePageHandle postBasePageHandle, String deptId);
 }

src/main/java/com/mokamrp/privates/service/pangu/FosterwxMobileWxfriendService.java

@@ -1,5 +1,6 @@
 package com.mokamrp.privates.service.pangu;
 
+import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.entity.pangu.AddFosterwxMobileHandle;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,4 +19,6 @@ public interface FosterwxMobileWxfriendService extends IService<FosterwxMobileWx
     public Map<String, Object> getList(PostBasePageHandle handle);
     //.@leon 删除数据同时新增数据
     public Boolean removeAndAdd(AddFosterwxMobileHandle addFosterwxMobileHandle);
+    //.@leon 检查好友限制
+    public VoltaHandle<String> checkFriend(AddFosterwxMobileHandle addFosterwxMobileHandle);
 }

src/main/java/com/mokamrp/privates/service/pangu/PlaybillGroupService.java

@@ -15,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PlaybillGroupService extends IService<PlaybillGroup> {
     //.获取海报分组列表 带分组内海报数量
-    public Object getlist(PlaybillGroupListHandle playbillGroupListHandle);
+    public Object getlist(PlaybillGroupListHandle playbillGroupListHandle,String deptId);
 }

src/main/java/com/mokamrp/privates/service/pangu/PromoteCodeService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public interface PromoteCodeService extends IService<PromoteCode> {
     //.获取活码列表
-    public Object getlist(PromoteCodeListHandle promoteCodeListHandle);
+    public Object getlist(PromoteCodeListHandle promoteCodeListHandle,String deptId);
     //.获取活码详细信息
     public Object getInfo(String id);
     //.新增活码

src/main/java/com/mokamrp/privates/service/pangu/impl/CustserviceGroupServiceImpl.java

@@ -28,9 +28,9 @@ public class CustserviceGroupServiceImpl extends ServiceImpl<CustserviceGroupMap
     @Autowired
     CustserviceGroupMapper custserviceGroupMapper;
 
-    public Object getlist(CustserviceGroupListHandle custserviceGroupListHandle){
-        Page<CustserviceGroup> page = new Page<CustserviceGroup>(custserviceGroupListHandle.getPage(),custserviceGroupListHandle.getPagesize());
-        List<CustserviceGroup> custservices = custserviceGroupMapper.getlist(page);
+    public Object getlist(CustserviceGroupListHandle custserviceGroupListHandle,String deptId){
+        Page<CustserviceGroup> page = new Page<>(custserviceGroupListHandle.getPage(),custserviceGroupListHandle.getPagesize());
+        List<CustserviceGroup> custservices = custserviceGroupMapper.getlist(page,deptId);
         Map<String,Object> res = new HashMap<>();
         res.put("list",custservices);
         res.put("total",page.getTotal());

src/main/java/com/mokamrp/privates/service/pangu/impl/DomainFirstServiceImpl.java

@@ -1,11 +1,21 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
+import com.mokamrp.privates.mapper.pangu.CustserviceGroupMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.CustserviceGroup;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainFirst;
 import com.mokamrp.privates.mapper.pangu.DomainFirstMapper;
 import com.mokamrp.privates.service.pangu.DomainFirstService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 一级域名库 服务实现类
@@ -16,5 +26,15 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DomainFirstServiceImpl extends ServiceImpl<DomainFirstMapper, DomainFirst> implements DomainFirstService {
+    @Autowired
+    public DomainFirstMapper domainFirstMapper;
 
+    public Object getlist(PostBasePageHandle postBasePageHandle, String deptId){
+        Page<DomainFirst> page = new Page<DomainFirst>(postBasePageHandle.getPage(),postBasePageHandle.getPagesize());
+        List<DomainFirst> custservices = domainFirstMapper.getlist(page,deptId);
+        Map<String,Object> res = new HashMap<>();
+        res.put("list",custservices);
+        res.put("total",page.getTotal());
+        return res;
+    }
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/DomainSecondServiceImpl.java

@@ -1,11 +1,21 @@
 package com.mokamrp.privates.service.pangu.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mokamrp.privates.entity.PostBasePageHandle;
+import com.mokamrp.privates.entity.pangu.CustserviceGroupListHandle;
+import com.mokamrp.privates.mapper.pangu.CustserviceGroupMapper;
+import com.mokamrp.privates.mapper.pangu.pojo.CustserviceGroup;
 import com.mokamrp.privates.mapper.pangu.pojo.DomainSecond;
 import com.mokamrp.privates.mapper.pangu.DomainSecondMapper;
 import com.mokamrp.privates.service.pangu.DomainSecondService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 二级域名库 服务实现类
@@ -16,5 +26,15 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DomainSecondServiceImpl extends ServiceImpl<DomainSecondMapper, DomainSecond> implements DomainSecondService {
+    @Autowired
+    public DomainSecondMapper domainSecondMapper;
 
+    public Object getlist(PostBasePageHandle postBasePageHandle, String deptId){
+        Page<DomainSecond> page = new Page<DomainSecond>(postBasePageHandle.getPage(),postBasePageHandle.getPagesize());
+        List<DomainSecond> custservices = domainSecondMapper.getlist(page,deptId);
+        Map<String,Object> res = new HashMap<>();
+        res.put("list",custservices);
+        res.put("total",page.getTotal());
+        return res;
+    }
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileWxfriendServiceImpl.java

@@ -1,9 +1,14 @@
 package com.mokamrp.privates.service.pangu.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mokamrp.privates.constant.HttpMsg;
+import com.mokamrp.privates.entity.VoltaHandle;
 import com.mokamrp.privates.entity.pangu.AddFosterwxMobileHandle;
+import com.mokamrp.privates.help.AjaxResult;
+import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobile;
 import com.mokamrp.privates.mapper.pangu.pojo.FosterwxMobileWxfriend;
 import com.mokamrp.privates.mapper.pangu.FosterwxMobileWxfriendMapper;
+import com.mokamrp.privates.service.pangu.FosterwxMobileService;
 import com.mokamrp.privates.service.pangu.FosterwxMobileWxfriendService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -14,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -28,6 +34,9 @@ public class FosterwxMobileWxfriendServiceImpl extends ServiceImpl<FosterwxMobil
 
     @Autowired
     public FosterwxMobileWxfriendMapper fosterwxMobileWxfriendMapper;
+
+    @Autowired
+    public FosterwxMobileService fosterwxMobileService;
     /**
      * 获取数据列表 支持分页
      * @param handle
@@ -64,4 +73,47 @@ public class FosterwxMobileWxfriendServiceImpl extends ServiceImpl<FosterwxMobil
         this.saveBatch(add);
         return true;
     }
+
+    /**
+     * 检查好友限制
+     * @param addFosterwxMobileHandle
+     * @return
+     */
+    public VoltaHandle<String> checkFriend(AddFosterwxMobileHandle addFosterwxMobileHandle){
+        VoltaHandle<String> res = new VoltaHandle<>();
+        //.判断好友微信名称是否同样的超过3个
+        FosterwxMobile fosterwxMobile = fosterwxMobileService.getOne(new QueryWrapper<FosterwxMobile>().eq("id",addFosterwxMobileHandle.getMobileId()));
+        List<FosterwxMobile> mobileList = fosterwxMobileService.list(new QueryWrapper<FosterwxMobile>().eq("station_id",fosterwxMobile.getStationId()));
+        List<Integer> mobileIds = mobileList.stream().map(FosterwxMobile::getId).collect(Collectors.toList());
+        List<FosterwxMobileWxfriend> friends = this.list(new QueryWrapper<FosterwxMobileWxfriend>()
+                .in("mobile_id",mobileIds)
+        );
+        Map<String,Boolean> friendsNames = new HashMap<>();
+        for (FosterwxMobileWxfriend add :addFosterwxMobileHandle.getFriends()){
+            if(friendsNames.get(add.getWxName()) != null){
+                res.setErr(HttpMsg.wxFriendResume+add.getWxName());
+                return res;
+            }
+            friendsNames.put(add.getWxName(),true);
+            Boolean findRes = this.checkWxFriendCnt(friends,add.getWxName());
+            if (!findRes){
+                res.setErr(HttpMsg.wxFriendCntMax3+add.getWxName());
+                return res;
+            }
+        }
+        return res;
+    }
+
+    public Boolean checkWxFriendCnt(List<FosterwxMobileWxfriend> row,String wxName){
+        Integer findCnt = 0;
+        for (FosterwxMobileWxfriend fosterwxMobileWxfriend : row){
+            if (fosterwxMobileWxfriend.getWxName().equals(wxName)){
+                findCnt++;
+            }
+            if (findCnt >= 3){
+                return false;
+            }
+        }
+        return true;
+    }
 }

src/main/java/com/mokamrp/privates/service/pangu/impl/PlaybillGroupServiceImpl.java

@@ -28,9 +28,9 @@ public class PlaybillGroupServiceImpl extends ServiceImpl<PlaybillGroupMapper, P
     @Autowired
     public PlaybillGroupMapper playbillGroupMapper;
 
-    public Object getlist(PlaybillGroupListHandle playbillGroupListHandle){
+    public Object getlist(PlaybillGroupListHandle playbillGroupListHandle,String deptId){
         Page<PlaybillGroup> page = new Page<>(playbillGroupListHandle.getPage(),playbillGroupListHandle.getPagesize());
-        List<PlaybillGroup> playbillGroups = playbillGroupMapper.getlist(page,playbillGroupListHandle);
+        List<PlaybillGroup> playbillGroups = playbillGroupMapper.getlist(page,playbillGroupListHandle,deptId);
         Map<String,Object> res = new HashMap<>();
         res.put("list",playbillGroups);
         res.put("total",page.getTotal());

src/main/java/com/mokamrp/privates/service/pangu/impl/PromoteCodeServiceImpl.java

@@ -41,9 +41,9 @@ public class PromoteCodeServiceImpl extends ServiceImpl<PromoteCodeMapper, Promo
     @Autowired
     public StringRedisTemplate stringRedisTemplate;
 
-    public Object getlist(PromoteCodeListHandle promoteCodeListHandle){
+    public Object getlist(PromoteCodeListHandle promoteCodeListHandle,String deptId){
         Page<PromoteCodeVo> page = new Page<PromoteCodeVo>(promoteCodeListHandle.getPage(),promoteCodeListHandle.getPagesize());
-        List<PromoteCodeVo> list = promoteCodeMapper.getlist(page,promoteCodeListHandle);
+        List<PromoteCodeVo> list = promoteCodeMapper.getlist(page,promoteCodeListHandle,deptId);
         Map<String,Object> res = new HashMap<>();
         res.put("list",list);
         res.put("total",page.getTotal());