Commit f1d2d9ef by 徐高华

login

parent a138d669
...@@ -272,6 +272,7 @@ public class LoginController extends WebBaseController { ...@@ -272,6 +272,7 @@ public class LoginController extends WebBaseController {
StaffDTO dto = this.staffApiService.selectById(staffId) ; StaffDTO dto = this.staffApiService.selectById(staffId) ;
StaffVO staffVO = EntityUtil.changeEntityByOrika(StaffVO.class, dto) ; StaffVO staffVO = EntityUtil.changeEntityByOrika(StaffVO.class, dto) ;
staffVO.setStaffName(staffVO.getStaffName()+"("+loginUser.getClerkName()+")"); staffVO.setStaffName(staffVO.getStaffName()+"("+loginUser.getClerkName()+")");
vo.setStaffName(staffVO.getStaffName()+"("+loginUser.getClerkName()+")");
vo.setStaffDTO(staffVO); vo.setStaffDTO(staffVO);
return this.success(vo) ; return this.success(vo) ;
} }
......
...@@ -362,6 +362,7 @@ public class StaffController extends WebBaseController { ...@@ -362,6 +362,7 @@ public class StaffController extends WebBaseController {
List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIds, storeIds, search); List<ClerkDTO> clerkDTOList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIds, storeIds, search);
List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList); List<ClerkInfoVo> retList = EntityUtil.changeEntityListByJSON(ClerkInfoVo.class, clerkDTOList);
if (CollectionUtils.isNotEmpty(retList)) { if (CollectionUtils.isNotEmpty(retList)) {
logger.info("导购数量={}",retList.size());
List<String> clerkIds = retList.stream().map(ClerkInfoVo::getClerkId).collect(Collectors.toList()); List<String> clerkIds = retList.stream().map(ClerkInfoVo::getClerkId).collect(Collectors.toList());
List<StaffClerkRelationDTO> dtos = staffClerkRelationApiService.listByClerkIds(clerkIds); List<StaffClerkRelationDTO> dtos = staffClerkRelationApiService.listByClerkIds(clerkIds);
if (CollectionUtils.isNotEmpty(dtos)) { if (CollectionUtils.isNotEmpty(dtos)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment