From ecee67107bdceaaf8e6008c2987b7dbbe9179aaa Mon Sep 17 00:00:00 2001 From: luyan Date: Fri, 2 Jun 2023 14:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E9=A1=B9=E7=9B=AE=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=A7=92=E8=89=B2=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E5=90=8D=E6=97=8F=E5=92=8C=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=90=8D=E7=A7=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/StaffDetailResultDTO.java | 10 ++++++++++ .../main/java/com/epmet/dto/CustomerStaffDTO.java | 2 ++ .../service/impl/CustomerStaffServiceImpl.java | 14 ++++++++++---- .../src/main/resources/mapper/GovStaffRoleDao.xml | 6 ++++-- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffDetailResultDTO.java index 5fddf2a14f..65eb325288 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffDetailResultDTO.java @@ -97,4 +97,14 @@ public class StaffDetailResultDTO implements Serializable { */ private String political; + /** + * 网格名称 + */ + private String gridName; + + /** + * 民族 + */ + private String MZ; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java index 3e3d2664a3..c1d01d89ef 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java @@ -189,5 +189,7 @@ public class CustomerStaffDTO implements Serializable { */ private String political; + private String MZ; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 6597720348..82f449299b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; +import com.epmet.commons.tools.dto.form.IdAndNameDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -37,10 +38,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.password.PasswordUtils; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.IdCardRegexUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.CustomerStaffConstant; import com.epmet.constant.RoleKeyConstants; import com.epmet.constant.UserConstant; @@ -694,6 +692,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl gridList = staffInfo.getGridList(); + if (null != staffInfo.getGridList() && staffInfo.getGridList().size() > 0) { + resultDTO.setGridName(staffInfo.getAgencyName() + "-" + gridList.get(0).getName()); + }else { + resultDTO.setGridName(staffInfo.getAgencyName()); + } resultDTO.setId(customerStaffDTO.getId()); resultDTO.setStaffId(customerStaffDTO.getUserId()); resultDTO.setName(customerStaffDTO.getRealName()); @@ -711,6 +716,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffRoles = govStaffRoleService.listRolesByStaffId(fromDTO.getStaffId(), fromDTO.getAgencyId()); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml index 7712a0b58c..70e8e7af92 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml @@ -42,7 +42,9 @@ INNER JOIN gov_staff_role r ON ( sr.ROLE_ID = r.ID ) AND r.DEL_FLAG = '0' WHERE sr.STAFF_ID = #{staffId} - AND sr.ORG_ID = #{orgId} + + AND sr.ORG_ID = #{orgId} + AND sr.DEL_FLAG = '0' AND r.DEL_FLAG = '0' ORDER BY r.SORT asc @@ -174,4 +176,4 @@ id = #{roleId} - \ No newline at end of file +