From 05d0acc72310dd60c2db29bbe62520607e98dba5 Mon Sep 17 00:00:00 2001 From: Yen Date: Sat, 6 May 2023 18:04:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/common/util/StringUtils.java | 2 +- .../my/BazMyVisitInstanceController.java | 4 +-- .../biz/controller/BizVisitController.java | 5 +-- .../biz/controller/api/BizCusVisitApi.java | 6 ++-- .../biz/controller/api/BizVisitApi.java | 5 +-- .../controller/my/BizVisitMyController.java | 5 +-- .../controller/my/BmsChannelMyController.java | 5 +-- .../my/BmsChannelPointMyController.java | 5 +-- .../my/BmsSupplierMyController.java | 5 +-- .../sys/controller/SysPostController.java | 6 ++++ .../service/impl/SysPostUserServiceImpl.java | 10 ++++-- .../controller/TbsCostApplyController.java | 8 +++-- .../service/TbsBudgetApplicationService.java | 33 +++++++++++++------ .../service/impl/TbsBudgetServiceImpl.java | 6 ++-- .../TbsScheduleItemBudgetServiceImpl.java | 1 + .../wx/controller/WxFormPushController.java | 11 +++---- .../controller/WxFormPushUserController.java | 3 +- 17 files changed, 75 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/qs/serve/common/util/StringUtils.java b/src/main/java/com/qs/serve/common/util/StringUtils.java index 4b04796c..1e758ddb 100644 --- a/src/main/java/com/qs/serve/common/util/StringUtils.java +++ b/src/main/java/com/qs/serve/common/util/StringUtils.java @@ -126,7 +126,7 @@ public class StringUtils extends org.springframework.util.StringUtils { public static List splitIdLong(String ids){ List strs = splitIdString(ids); if(strs!=null){ - return strs.stream().map(a->Long.parseLong(a)).collect(Collectors.toList()); + return strs.stream().map(Long::parseLong).collect(Collectors.toList()); } return null; } diff --git a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java index 2bf81619..c3fa020d 100644 --- a/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java +++ b/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java @@ -40,7 +40,6 @@ public class BazMyVisitInstanceController { private BazVisitInstanceService bazVisitInstanceService; private BazVisitService visitService; - private SysUserSalesService sysUserSalesService; private SysPostUserService postUserService; @@ -81,8 +80,7 @@ public class BazMyVisitInstanceController { if(param.getQueryEndDate()!=null){ lqw.le(BazVisitInstance::getCreateTime,param.getQueryEndDate()); } - //postUserService.listByUserId() - List userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId()); + List userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); if(userIds.size()<1){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java index f24cf439..ac30a565 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java @@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.PageUtil; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -32,8 +33,8 @@ import java.util.List; public class BizVisitController { private BizVisitService bizVisitService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 翻页（我的下属拜访记录） * @param param @@ -41,7 +42,7 @@ public class BizVisitController { */ @GetMapping("/page4Under") public R> page4Under(BizVisit param){ - List userIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId()); + List userIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); if(userIds.size()<1){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java index a640fddb..86ebfa3e 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java @@ -14,6 +14,7 @@ import com.qs.serve.modules.biz.service.BizVisitService; import com.qs.serve.modules.bms.entity.*; import com.qs.serve.modules.bms.service.*; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; @@ -47,7 +48,8 @@ public class BizCusVisitApi { private BmsSupplierVisitFormService bmsSupplierVisitFormService; private BmsSupplierVisitAddressService bmsSupplierVisitAddressService; - private SysUserSalesService sysUserSalesService; + + private SysPostUserService postUserService; /** * 翻页 @@ -81,7 +83,7 @@ public class BizCusVisitApi { return R.byEmptyList(); } String userId = wxUser.getSysUserId(); - List userIds = sysUserSalesService.listByChildIds(userId); + List userIds = postUserService.listByChildIds(userId); if(userIds.size()<1){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java index d1ae2d6c..73188481 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.biz.entity.BizCusVisit; import com.qs.serve.modules.biz.entity.BizVisit; import com.qs.serve.modules.biz.service.BizVisitService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; @@ -39,8 +40,8 @@ public class BizVisitApi { private BizVisitService bizVisitService; private WxUserService wxUserService; private SysUserService sysUserService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 翻页 * @param param @@ -79,7 +80,7 @@ public class BizVisitApi { return R.byEmptyList(); } String userId = wxUser.getSysUserId(); - List userIds = sysUserSalesService.listByChildIds(userId); + List userIds = postUserService.listByChildIds(userId); if(userIds.size()<1){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java b/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java index cea0462b..1ce074a2 100644 --- a/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java +++ b/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java @@ -8,6 +8,7 @@ import com.qs.serve.common.util.PageUtil; import com.qs.serve.modules.biz.entity.BizVisit; import com.qs.serve.modules.biz.service.BizVisitService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.wx.entity.WxUser; @@ -33,7 +34,7 @@ public class BizVisitMyController { private BizVisitService bizVisitService; private SysUserService sysUserService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 翻页 @@ -65,7 +66,7 @@ public class BizVisitMyController { @GetMapping("/page4Under") public R> page4Under(BizVisit param){ String userId = AuthContextUtils.getSysUserId(); - List userIds = sysUserSalesService.listByChildIds(userId); + List userIds = postUserService.listByChildIds(userId); if(userIds.size()<1){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java index 994ebecd..56d34aaa 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java @@ -22,6 +22,7 @@ import com.qs.serve.modules.bms.service.BmsMasterUserService; import com.qs.serve.modules.bms.service.BmsRegionUserService; import com.qs.serve.modules.his.entity.HisUserChannelPoint; import com.qs.serve.modules.his.service.HisUserChannelPointService; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.tbs.entity.TbsActivityChannel; import com.qs.serve.modules.tbs.service.TbsActivityChannelService; @@ -47,7 +48,7 @@ public class BmsChannelMyController { private BmsChannelService bmsChannelService; private BmsMasterUserService bmsMasterUserService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 翻页(我负责的) @@ -82,7 +83,7 @@ public class BmsChannelMyController { @GetMapping("/page4Under") public R> getPage4Under(BmsChannel param){ String loginUserId = AuthContextUtils.getSysUserId(); - List userIds = sysUserSalesService.listByChildIds(loginUserId); + List userIds = postUserService.listByChildIds(loginUserId); if(CollectionUtil.isEmpty(userIds)){ return R.byEmptyList(); } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java index 80e7e2cb..d72f4db0 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java @@ -25,6 +25,7 @@ import com.qs.serve.modules.bms.service.BmsRegionService; import com.qs.serve.modules.bms.service.BmsRegionUserService; import com.qs.serve.modules.his.service.HisUserChannelPointService; import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.entity.TbsActivityChannelPoint; @@ -58,7 +59,7 @@ public class BmsChannelPointMyController { private HisUserChannelPointService hisUserChannelPointService; private SysUserService sysUserService; private BmsRegionUserService bmsRegionUserService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** @@ -99,7 +100,7 @@ public class BmsChannelPointMyController { @GetMapping("/page4Under") public R> getPage4Under(BmsChannelPoint param){ String loginUserId = AuthContextUtils.getSysUserId(); - List userIds = sysUserSalesService.listByChildIds(loginUserId); + List userIds = postUserService.listByChildIds(loginUserId); param.setUserIdList(userIds); LambdaQueryWrapper rulqw = new LambdaQueryWrapper<>(); rulqw.select(BmsRegionUser::getPathIds,BmsRegionUser::getId); diff --git a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java index 8cd1a3a2..d5b421b3 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.his.entity.HisUserSupplier; import com.qs.serve.modules.his.service.HisUserSupplierService; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.wx.entity.WxUser; import com.qs.serve.modules.wx.service.WxUserService; @@ -40,7 +41,7 @@ public class BmsSupplierMyController { private final BmsSupplierService bmsSupplierService; private final HisUserSupplierService hisUserSupplierService; - private final SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 翻页查询（我负责的） @@ -61,7 +62,7 @@ public class BmsSupplierMyController { */ @GetMapping("/underlingPage") public R> getUnderlingPage(BmsSupplier param){ - List childIds = sysUserSalesService.listByChildIds(AuthContextUtils.getSysUserId()); + List childIds = postUserService.listByChildIds(AuthContextUtils.getSysUserId()); param.setSelectUserIds(childIds); param.setSelectUserIdsFlag(true); List list = hisUserSupplierService.selectSupplier(param,true); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java index afb6c4cf..987e9971 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.sys.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.qs.serve.common.model.annotation.SysLog; import com.qs.serve.common.model.dto.PageVo; @@ -126,6 +127,11 @@ public class SysPostController { @SysLog(title = "职务",biz = BizType.DELETE) @DeleteMapping("/deleteById/{id}") public R deleteById(@PathVariable("id") String id){ + LambdaQueryWrapper postLqw = new LambdaQueryWrapper<>(); + postLqw.eq(SysPost::getPid,id); + if(sysPostService.count(postLqw)>0){ + return R.error("含有子节点，无法删除"); + } boolean result = sysPostService.removeById(id); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java index a731d181..eee486c4 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java @@ -42,9 +42,15 @@ public class SysPostUserServiceImpl extends ServiceImpl postUserList = this.listByUserId(userId); Set userIdSet = new HashSet<>(); for (SysPostUser postUser : postUserList) { - + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.likeRight(SysPostUser::getPathIds,postUser.getPathIds()+"_"); + lqw.select(SysPostUser::getUserId,SysPostUser::getId); + List sysPostUsers = this.list(lqw); + for (SysPostUser childUser : sysPostUsers) { + userIdSet.add(childUser.getUserId()); + } } - return null; + return new ArrayList<>(userIdSet); } @Override diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 63b10f6e..2bd43310 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -21,6 +21,7 @@ import com.qs.serve.modules.seeyon.service.SeeYonService; import com.qs.serve.modules.sys.entity.SysAttach; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysConfigService; +import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysUserSalesService; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsCostApplyState; @@ -71,8 +72,8 @@ public class TbsCostApplyController { private SeeYonService seeYonService; private TbsBudgetApplicationService budgetApplicationService; - private SysUserSalesService sysUserSalesService; + private SysPostUserService postUserService; /** * 预览 * @param id @@ -90,6 +91,7 @@ public class TbsCostApplyController { * @param id * @return */ + @GetMapping("preview2") public R viewTable(Long id){ TbsBudgetTableVo result = budgetApplicationService.buildResultTable(id); @@ -122,7 +124,7 @@ public class TbsCostApplyController { String userId = AuthContextUtils.getSysUserId(); List userIds = new ArrayList<>(); if(param.getLoadChild()!=null&¶m.getLoadChild().equals(1)){ - userIds = sysUserSalesService.listByChildIds(userId); + userIds = postUserService.listByChildIds(userId); } userIds.add(userId); TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); @@ -145,7 +147,7 @@ public class TbsCostApplyController { String userId = AuthContextUtils.getSysUserId(); List userIds = new ArrayList<>(); if(param.getLoadChild()!=null&¶m.getLoadChild().equals(1)){ - userIds = sysUserSalesService.listByChildIds(userId); + userIds = postUserService.listByChildIds(userId); } userIds.add(userId); TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index e69cc42e..92005946 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -21,6 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.time.Duration; import java.util.*; import java.util.stream.Collectors; @@ -202,6 +203,8 @@ public class TbsBudgetApplicationService { budgetLqw.and(qw->qw.eq(TbsBudget::getSubjectId,0).or(qw2->qw2.in(TbsBudget::getSubjectId,subjectIds))); budgetLqw.in(TbsBudget::getCenterId,centerIds); budgetLqw.eq(TbsBudget::getBudgetState,1); + //科目限制>品类之间>时间区间 + budgetLqw.orderByDesc(TbsBudget::getSubjectId); budgetList = tbsBudgetMapper.selectList(budgetLqw); }else { budgetList = new ArrayList<>(); @@ -476,21 +479,23 @@ public class TbsBudgetApplicationService { //拦截非当前成本中心 String centerId = activityCostItem.getCenterId(); String centerType = activityCostItem.getCenterType(); - for (TbsBudget budget : currentItemBudgetList) { - if(!budget.getCenterId().equals(centerId) || - !budget.getCenterType().equals(centerType) ){ - continue; - } - if(!subjectId.equals(budget.getSubjectId())&&!budget.getSubjectId().equals(0L)){ - continue; - } - List scheduleItemBudgets = activity.getScheduleItemBudgetList(); - for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemBudgets) { + /* 科目条件优先级最高 */ + List scheduleItemBudgets = activity.getScheduleItemBudgetList(); + for (TbsScheduleItemBudget scheduleItemBudget : scheduleItemBudgets) { + for (TbsBudget budget : currentItemBudgetList) { + if(!budget.getCenterId().equals(centerId) || + !budget.getCenterType().equals(centerType) ){ + continue; + } + if(!subjectId.equals(budget.getSubjectId())&&!budget.getSubjectId().equals(0L)){ + continue; + } if(scheduleItemBudget.getBudgetId().equals(budget.getId())){ currentScheduleItemBudgets.add(scheduleItemBudget); } } } + } //检测是否有是否足够预算 BigDecimal goodsAmount = activityCostItem.getCenterGoodsAmount(); @@ -685,6 +690,14 @@ public class TbsBudgetApplicationService { scheduleItemList.add(allAllowScheduleItemTempMap.get(tmpId)); } budgetIds.addAll(budgetIdsSet); +// Collections.sort(scheduleItemList, new Comparator() { +// @Override +// public int compare(TbsScheduleItemBudget o1, TbsScheduleItemBudget o2) { +// long d = Duration.between(o1.getStartDate(), o1.getEndDate()).toDays(); +// long d2 = Duration.between(o2.getStartDate(), o2.getEndDate()).toDays(); +// return (int) (d-d2); +// } +// }); return scheduleItemList; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index 699af574..0f3cd44e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -92,9 +92,9 @@ public class TbsBudgetServiceImpl extends ServiceImpl List categoryIds = budgetBo.getCategoryIds(); //添加条件拦截 boolean sameCondition = filterSameCondition(budget,skuIds, spuIds, seriesIds, brandIds, categoryIds); - if(sameCondition){ - Assert.throwEx("已存在相同条件预算"); - } +// if(sameCondition){ +// Assert.throwEx("已存在相同条件预算"); +// } BmsSubject subject = null; if(budget.getSubjectId()!=0L){ subject = subjectService.getById(budgetBo.getSubjectId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java index 82f2d324..5122e3fb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java @@ -27,6 +27,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.le(TbsScheduleItemBudget::getStartDate,startDate); lqw.ge(TbsScheduleItemBudget::getEndDate,endDate); + lqw.last("order by timediff(start_date,end_date) desc,end_date asc"); return this.list(lqw); } diff --git a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java index 1b708c48..fc50829c 100644 --- a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java +++ b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java @@ -245,11 +245,9 @@ public class WxFormPushController { pushUser.setUserId(wxUser.getSysUserId()); pushUser.setUserCode(wxUser.getSysUserCode()); pushUser.setUserName(wxUser.getEmpName()); - if(pushType!=null){ - pushUser.setTypeId(pushType.getId()); - pushUser.setTypeCode(pushType.getCode()); - pushUser.setTypeName(pushType.getTitle()); - } + pushUser.setTypeId(pushType.getId()); + pushUser.setTypeCode(pushType.getCode()); + pushUser.setTypeName(pushType.getTitle()); pushUserList.add(pushUser); } pushUserList = pushUserList.stream().distinct().collect(Collectors.toList()); @@ -261,8 +259,7 @@ public class WxFormPushController { wxFormPushUserService.remove(dellqw); wxFormPushUserService.saveBatch(pushUserList); } - - return R.isTrue(result); + return R.ok(entity); } /** diff --git a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java index 14aef447..bc6d5e44 100644 --- a/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java +++ b/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java @@ -40,11 +40,10 @@ public class WxFormPushUserController { * @param param * @return */ - //@GetMapping("/list") + @GetMapping("/list") public R> getList(WxFormPushUserSo param){ WxFormPushUser entity = CopierUtil.copy(param,new WxFormPushUser()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(entity); - PageUtil.startPage(); List list = wxFormPushUserService.list(lqw); return R.ok(list); }