From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001 From: doum <doum> Date: 星期四, 11 九月 2025 18:43:14 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java index 63d795a..133bb4b 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/EmpowerServiceImpl.java @@ -1,11 +1,9 @@ package com.doumee.service.business.impl; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.LoginUserInfo; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; -import com.doumee.core.utils.Date; -import com.doumee.core.utils.Utils; -import com.doumee.dao.admin.response.MemberInfoDTO; import com.doumee.dao.business.EmpowerMapper; import com.doumee.dao.business.join.EmpowerJoinMapper; import com.doumee.dao.business.model.Company; @@ -111,13 +109,21 @@ queryWrapper.selectAs(Member::getPhone,Empower::getMemberPhone); queryWrapper.selectAs(Member::getIdcardDecode,Empower::getMemberidCard); queryWrapper.selectAs(Device::getName,Empower::getDeviceName); - queryWrapper.selectAs(Company::getName,Empower::getCompanyName); + queryWrapper.selectAs(Company::getCompanyNamePath,Empower::getCompanyName); queryWrapper.selectAs(SystemUser::getUsername,Empower::getCreaterName); queryWrapper.leftJoin(Member.class,Member::getId,Empower::getMemberId); queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId); queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Empower::getCreator); queryWrapper.leftJoin(Device.class,Device::getId,Empower::getDeviceId); - + LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo(); + if(userInfo!=null && userInfo.getCompanyIdList()!=null){ + if( userInfo.getCompanyIdList().size() ==0){ + //鍙兘鐪嬭嚜宸� + queryWrapper.eq(Member::getId,userInfo.getMemberId()); + }else{ + queryWrapper.in(Company::getId,userInfo.getCompanyIdList()); + } + } queryWrapper /* .eq(Empower::getIsdeleted, Constants.ZERO)*/ .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName()) -- Gitblit v1.9.3