ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

Browse Source
This commit is contained in:
furongxin 2024-12-05 10:36:33 +08:00
commit aebc13aee1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java
View File

@ -75,7 +75,7 @@ public class AchievementServiceImpl implements AchievementService {
@Override @Override
public PageResult<UserAchieveVO> getAchievementPage(AchievementPageReqVO pageReqVO) { public PageResult<UserAchieveVO> getAchievementPage(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setUsername(pageReqVO.getName()); dto.setNickName(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java
View File

@ -128,7 +128,7 @@ public class CustomerServiceImpl implements CustomerService {
@Override @Override
public PageResult<UserVolumeVO> getCustomerVolume(AchievementPageReqVO pageReqVO) { public PageResult<UserVolumeVO> getCustomerVolume(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setUsername(pageReqVO.getName()); dto.setNickName(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();
@ -159,7 +159,7 @@ public class CustomerServiceImpl implements CustomerService {
@Override @Override
public PageResult<UserRecordVO> getRecord(AchievementPageReqVO pageReqVO) { public PageResult<UserRecordVO> getRecord(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setUsername(pageReqVO.getName()); dto.setNickName(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/RemindJob.java
View File

@ -94,7 +94,7 @@ public class RemindJob {
} }
List<SubscribeMessageReqDTO> dtos = new ArrayList<>(); List<SubscribeMessageReqDTO> dtos = new ArrayList<>();
for (AdminOauthUserOtherInfoDO user : list) { for (AdminOauthUserOtherInfoDO user : list) {
AttendanceWorkDTO attendanceWorkDTO = map.get(user.getId()); AttendanceWorkDTO attendanceWorkDTO = map.get(user.getUserId());
SubscribeMessageReqDTO dto = new WxMaMsgTemplateUtils().convertCheckInReminder(new CheckInReminderDTO() SubscribeMessageReqDTO dto = new WxMaMsgTemplateUtils().convertCheckInReminder(new CheckInReminderDTO()
.setOpenId(user.getOpenId()) .setOpenId(user.getOpenId())
.setCheckInType(attendanceWorkDTO.getWorkTypeStr()) .setCheckInType(attendanceWorkDTO.getWorkTypeStr())

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
View File

@ -86,7 +86,7 @@ public class BirthdayJob {
if (CollectionUtil.isNotEmpty(userIds)) { if (CollectionUtil.isNotEmpty(userIds)) {
list = adminOauthUserOtherInfoService.getOpenIdByCondition(new AdminOauthUserOtherInfoDTO() list = adminOauthUserOtherInfoService.getOpenIdByCondition(new AdminOauthUserOtherInfoDTO()
.setSocialType(SocialTypeEnum.WECHAT_MINI_APP.getType()) .setSocialType(SocialTypeEnum.WECHAT_MINI_APP.getType())
.setUserIds(new ArrayList<>())); .setUserIds(new ArrayList<>(userIds)));
} }
// 生日提醒 // 生日提醒
birthdayRemind(list); birthdayRemind(list);

4
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/auth/AdminOauthUserOtherInfoMapper.xml
View File

@ -44,13 +44,13 @@
<if test="dto.userType != null"> <if test="dto.userType != null">
and b.user_type = #{dto.userType} and b.user_type = #{dto.userType}
</if> </if>
<if test="dto.deptIds != null"> <if test="dto.deptIds != null and dto.deptIds.size() > 0">
and b.dept_id in and b.dept_id in
<foreach collection="dto.deptIds" item="deptId" open="(" close=")" separator=","> <foreach collection="dto.deptIds" item="deptId" open="(" close=")" separator=",">
#{deptId} #{deptId}
</foreach> </foreach>
</if> </if>
<if test="dto.userIds != null"> <if test="dto.userIds != null and dto.userIds() > 0">
and b.id in and b.id in
<foreach collection="dto.userIds" item="userId" open="(" close=")" separator=","> <foreach collection="dto.userIds" item="userId" open="(" close=")" separator=",">
#{userId} #{userId}