From db12f838e8bba7a38f9b97e3a38a9669315b4e36 Mon Sep 17 00:00:00 2001 From: aikai Date: Wed, 4 Dec 2024 16:54:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?crm=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/service/crmanalysis/AchievementServiceImpl.java | 2 +- .../module/crm/service/crmanalysis/CustomerServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java index 265eecbd..27e5be58 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java @@ -75,7 +75,7 @@ public class AchievementServiceImpl implements AchievementService { @Override public PageResult getAchievementPage(AchievementPageReqVO pageReqVO) { AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); - dto.setUsername(pageReqVO.getName()); + dto.setNickName(pageReqVO.getName()); dto.setPageNo(pageReqVO.getPageNo()); dto.setPageSize(pageReqVO.getPageSize()); PageResult pageResult = adminUserApi.getUserPage(dto).getCheckedData(); diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java index c93b8e42..809fae6e 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java @@ -128,7 +128,7 @@ public class CustomerServiceImpl implements CustomerService { @Override public PageResult getCustomerVolume(AchievementPageReqVO pageReqVO) { AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); - dto.setUsername(pageReqVO.getName()); + dto.setNickName(pageReqVO.getName()); dto.setPageNo(pageReqVO.getPageNo()); dto.setPageSize(pageReqVO.getPageSize()); PageResult pageResult = adminUserApi.getUserPage(dto).getCheckedData(); @@ -159,7 +159,7 @@ public class CustomerServiceImpl implements CustomerService { @Override public PageResult getRecord(AchievementPageReqVO pageReqVO) { AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); - dto.setUsername(pageReqVO.getName()); + dto.setNickName(pageReqVO.getName()); dto.setPageNo(pageReqVO.getPageNo()); dto.setPageSize(pageReqVO.getPageSize()); PageResult pageResult = adminUserApi.getUserPage(dto).getCheckedData(); From 0dfcf47093fc2837565e70b54183b2e413065513 Mon Sep 17 00:00:00 2001 From: aikai Date: Thu, 5 Dec 2024 09:50:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=8F=90=E9=86=92?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1bug=20=E5=A4=84=E7=90=86=20?= =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=B8=8A=E7=8F=AD=E5=89=8D=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1(=E5=A6=82=E7=94=9F=E6=97=A5=E6=8F=90?= =?UTF-8?q?=E9=86=92=E3=80=81=E8=BD=AC=E6=AD=A3=E6=8F=90=E9=86=92=E3=80=81?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=B0=E6=9C=9F=E6=8F=90=E9=86=92=E7=AD=89?= =?UTF-8?q?)=09bug=20=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/system/job/attendance/RemindJob.java | 2 +- .../iocoder/yudao/module/system/job/birthday/BirthdayJob.java | 2 +- .../resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java index 3ba47ca0..4817fd88 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java @@ -94,7 +94,7 @@ public class RemindJob { } List dtos = new ArrayList<>(); for (AdminOauthUserOtherInfoDO user : list) { - AttendanceWorkDTO attendanceWorkDTO = map.get(user.getId()); + AttendanceWorkDTO attendanceWorkDTO = map.get(user.getUserId()); SubscribeMessageReqDTO dto = new WxMaMsgTemplateUtils().convertCheckInReminder(new CheckInReminderDTO() .setOpenId(user.getOpenId()) .setCheckInType(attendanceWorkDTO.getWorkTypeStr()) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java index 19b9688e..9c007dab 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java @@ -86,7 +86,7 @@ public class BirthdayJob { if (CollectionUtil.isNotEmpty(userIds)) { list = adminOauthUserOtherInfoService.getOpenIdByCondition(new AdminOauthUserOtherInfoDTO() .setSocialType(SocialTypeEnum.WECHAT_MINI_APP.getType()) - .setUserIds(new ArrayList<>())); + .setUserIds(new ArrayList<>(userIds))); } // 生日提醒 birthdayRemind(list); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml index f8d746e7..30b1da8e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml @@ -44,13 +44,13 @@ and b.user_type = #{dto.userType} - + and b.dept_id in #{deptId} - + and b.id in #{userId}