From a2c129b7d725fdd361e63a79cc34c9422f251ec5 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 11 Jul 2024 09:38:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86=E5=91=98=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java | 4 ++-- .../yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml | 1 + .../anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java | 4 ++-- .../java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java | 4 ++-- .../biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java | 4 ++-- .../yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java index 2f983b1b70..0c41ea3630 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/RoleCodeListQuery.java @@ -12,8 +12,8 @@ import java.util.List; */ @Data public class RoleCodeListQuery { - @ApiModelProperty("分公司sid") - private String createOrgSid; + @ApiModelProperty("部门sid") + private String useOrgSid; @ApiModelProperty("角色编码") private List roleCode; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml index a746d0df92..248d9b2067 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml @@ -406,6 +406,7 @@ LEFT JOIN sys_staffinfo as sf ON u.staffSid = sf.sid LEFT JOIN sys_staff_org as so ON sf.sid = so.staffSid WHERE so.orgSidPath like CONCAT( '%', #{orgSidPath}, '%' ) + AND u.isDelete = 0 and sf.isDelete = 0 and sf.personTypeKey != '01' AND r.code IN #{item} diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java index 6c386a9566..0fd0d3faf2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java @@ -815,9 +815,9 @@ public class SysStaffinfoService extends MybatisBaseService getStaffNameByRoleCode(RoleCodeListQuery query) { - String createOrgSid = query.getCreateOrgSid(); + String useOrgSid = query.getUseOrgSid(); List roleCode = query.getRoleCode(); - SysOrganization sysOrganization = sysOrganizationService.fetchBySid(createOrgSid); + SysOrganization sysOrganization = sysOrganizationService.fetchBySid(useOrgSid); String orgSidPath = sysOrganization.getOrgSidPath(); List list = baseMapper.getStaffNameByRoleCode(orgSidPath,roleCode); return list; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java index 2323d7c555..2c37630cec 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/base/WmsWarehouseInfoRest.java @@ -78,9 +78,9 @@ public class WmsWarehouseInfoRest { @ApiOperation("查询仓库管理员") @GetMapping("/selMangerByRole") - public ResultBean> selMangerByRole(@RequestParam("createOrgSid") String createOrgSid){ + public ResultBean> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid){ ResultBean rb = ResultBean.fireFail(); - List vos = wmsWarehouseService.selMangerByRole(createOrgSid); + List vos = wmsWarehouseService.selMangerByRole(useOrgSid); return rb.success().setData(vos); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index 8ec207ae61..97b99a0677 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -243,14 +243,14 @@ public class WmsWarehouseInfoService extends MybatisBaseService selMangerByRole(String createOrgSid) { + public List selMangerByRole(String useOrgSid) { RoleCodeListQuery query = new RoleCodeListQuery(); List roleCode = new ArrayList<>(); List list = new ArrayList<>(); roleCode.add("74"); roleCode.add("75"); roleCode.add("76"); - query.setCreateOrgSid(createOrgSid); + query.setUseOrgSid(useOrgSid); query.setRoleCode(roleCode); List data = sysStaffinfoFeign.getStaffNameByRoleCode(query).getData(); if (!data.isEmpty()) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java index 85ecb17cae..89d8e490b9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysstaffinfo/RoleCodeListQuery.java @@ -12,8 +12,8 @@ import java.util.List; */ @Data public class RoleCodeListQuery { - @ApiModelProperty("分公司sid") - private String createOrgSid; + @ApiModelProperty("部门sid") + private String useOrgSid; @ApiModelProperty("角色编码") private List roleCode;