From ad6af73b3d4c9b60d02c22df79130d449840efcd Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 19 Oct 2021 17:30:30 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=90=8E=E4=BC=9A=E8=AE=AE=E6=9F=A5=E4=B8=8D?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/system/vo/LoginUser.java | 2 + .../CommitteeMeetingController.java | 12 +++--- .../controller/InternalMeetingController.java | 11 ++--- .../controller/OtherMeetingController.java | 12 +++--- .../controller/PayMeetingController.java | 12 +++--- .../StandardsMeetingController.java | 12 +++--- .../WorkGroupMeetingController.java | 43 ++----------------- .../meeting/service/IPayMeetingService.java | 3 ++ .../service/impl/PayMeetingServiceImpl.java | 43 +++++++++++++++++++ .../PayMemberProjectController.java | 8 +--- .../PayMemberProjectSubitemController.java | 5 +-- .../system/mapper/SysDepartMapper.java | 2 + .../system/mapper/SysUserDepartMapper.java | 2 + .../system/mapper/xml/SysDepartMapper.xml | 9 ++++ .../system/service/impl/SysBaseApiImpl.java | 4 ++ 15 files changed, 97 insertions(+), 83 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java index 0ff09ace..b4c063de 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/LoginUser.java @@ -100,6 +100,8 @@ public class LoginUser { */ private String departIds; + private String departNames; + /** * 职务，关联职务表 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index a1b8e613..4773b482 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -115,9 +115,8 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -216,7 +215,7 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -267,9 +266,8 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index d2247076..9c5e2ca3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -115,9 +115,7 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -216,7 +214,7 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -267,9 +265,8 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 64db6863..7006663a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -115,9 +115,8 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -216,7 +215,7 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -267,9 +266,8 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index 72b9b725..a9c3fee6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -211,9 +211,8 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); // 查询用户是否已报名此会议 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -305,7 +304,7 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -355,9 +354,8 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 2f364a3f..91109648 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -115,9 +115,8 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(payMeetingVO, payMeeting); @@ -216,7 +215,7 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -267,9 +266,8 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index d688d296..7729ff9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -93,42 +93,8 @@ public class WorkGroupMeetingController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); - String meetingStartTime = req.getParameter("meetingStartTime"); - String meetingEndTime = req.getParameter("meetingEndTime"); - if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { - queryWrapper.not( - a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) - ); - } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { - queryWrapper.not( - a -> a.lt("end_time", meetingStartTime) - ); - } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { - queryWrapper.not( - a -> a.gt("start_time", meetingEndTime) - ); - } - Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.page(page, queryWrapper); - for (PayMeeting meeting : pageList.getRecords()) { - //查询会议负责人 - LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); - List departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); - meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); - PayMeetingVO payMeetingVO = new PayMeetingVO(); - BeanUtils.copyProperties(payMeetingVO, payMeeting); - //查询酒店联系人列表 - if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); - List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); - meeting.setHotelContactsList(payMeetingHotelContactsList); - } - } + IPage pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); return Result.OK(pageList); } @@ -216,7 +182,7 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -267,9 +233,8 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + departName + ")"); + + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 012d2671..10ea2ed8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -65,4 +66,6 @@ public interface IPayMeetingService extends IService { IPage pageListContract(Page page, QueryWrapper queryWrapper, String now); + + IPage queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 5a4a3377..c2a76fb9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,6 +12,7 @@ import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; @@ -56,6 +58,8 @@ import java.util.Objects; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + import org.springframework.transaction.annotation.Transactional; /** @@ -486,4 +490,43 @@ public class PayMeetingServiceImpl extends ServiceImpl pageListContract(Page page, QueryWrapper queryWrapper, String now) { return baseMapper.pageListContract(page,queryWrapper,now); } + + @Override + public IPage queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); + String meetingStartTime = req.getParameter("meetingStartTime"); + String meetingEndTime = req.getParameter("meetingEndTime"); + if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { + queryWrapper.not( + a -> a.lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime) + ); + } + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = page(page, queryWrapper); + for (PayMeeting meeting : pageList.getRecords()) { + //查询会议负责人 + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); + PayMeetingVO payMeetingVO = new PayMeetingVO(); + BeanUtils.copyProperties(payMeetingVO, payMeeting); + //查询酒店联系人列表 + if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + meeting.setHotelContactsList(payMeetingHotelContactsList); + } + } + return pageList; + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index e94a5d0d..a4f58f34 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -81,9 +81,7 @@ public class PayMemberProjectController extends JeroController memberProjectPage = memberProjectService.getPage(page, queryWrapper); for (PayMemberProject memberProject : memberProjectPage.getRecords()) { LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); - List departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - memberProject.setDirectorName(user.getRealname() + "(" + departName + ")"); + memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); } return Result.OK(memberProjectPage); } @@ -261,9 +259,7 @@ public class PayMemberProjectController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - memberProject.setDirectorName(user.getRealname() + "(" + departName + ")"); + memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); } return super.exportListXls(pageList, PayMemberProject.class, "会员项目表"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index d688ca87..951ec8d7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -97,9 +97,8 @@ public class PayMemberProjectSubitemController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); - String departName = departNamesByUsername.get(0); - memberProjectSubitem.setDirectorName(user.getRealname() + "(" + departName + ")"); + + memberProjectSubitem.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); } return Result.OK(pageList); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java index 1be8f49d..f8b2b184 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java @@ -30,6 +30,8 @@ public interface SysDepartMapper extends BaseMapper { */ public List queryDepartsByUsername(@Param("username") String username); + List getDepartNameByUserId(@Param("userId") String userId); + @Select("select id from sys_depart where org_code=#{orgCode}") public String queryDepartIdByOrgCode(@Param("orgCode") String orgCode); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java index c38501d3..8e4805e7 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserDepartMapper.java @@ -8,4 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SysUserDepartMapper extends BaseMapper{ List getUserDepartByUid(@Param("userId") String userId); + + } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml index 960893dd..07608500 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml @@ -34,4 +34,13 @@ + \ No newline at end of file diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java index 0c4e799c..87f94a6a 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java @@ -96,6 +96,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Autowired private ISysUserDepartService sysUserDepartService; @Resource + private SysDepartMapper sysDepartMapper; + @Resource private SysPermissionMapper sysPermissionMapper; @Autowired private ISysPermissionDataRuleService sysPermissionDataRuleService; @@ -248,6 +250,8 @@ public class SysBaseApiImpl implements ISysBaseAPI { return null; } BeanUtils.copyProperties(sysUser, loginUser); + List departNameByUsername = sysDepartMapper.getDepartNameByUserId(sysUser.getId()); + loginUser.setDepartNames(StringUtils.join(departNameByUsername, ",")); return loginUser; }