修改查询仓库管理员接口

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<String> roleCode;
 

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
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}

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<SysStaffinfoMapper,
     }
 
     public List<StaffByRole> getStaffNameByRoleCode(RoleCodeListQuery query) {
-        String createOrgSid = query.getCreateOrgSid();
+        String useOrgSid = query.getUseOrgSid();
         List<String> roleCode = query.getRoleCode();
-        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(createOrgSid);
+        SysOrganization sysOrganization = sysOrganizationService.fetchBySid(useOrgSid);
         String orgSidPath = sysOrganization.getOrgSidPath();
         List<StaffByRole> list = baseMapper.getStaffNameByRoleCode(orgSidPath,roleCode);
         return list;

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<List<MangerVo>> selMangerByRole(@RequestParam("createOrgSid") String createOrgSid){
+    public ResultBean<List<MangerVo>> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid){
         ResultBean rb = ResultBean.fireFail();
-        List<MangerVo> vos = wmsWarehouseService.selMangerByRole(createOrgSid);
+        List<MangerVo> vos = wmsWarehouseService.selMangerByRole(useOrgSid);
         return rb.success().setData(vos);
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -243,14 +243,14 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         return baseMapper.selectAll();
     }
 
-    public List<MangerVo> selMangerByRole(String createOrgSid) {
+    public List<MangerVo> selMangerByRole(String useOrgSid) {
         RoleCodeListQuery query = new RoleCodeListQuery();
         List<String> roleCode = new ArrayList<>();
         List<MangerVo> list = new ArrayList<>();
         roleCode.add("74");
         roleCode.add("75");
         roleCode.add("76");
-        query.setCreateOrgSid(createOrgSid);
+        query.setUseOrgSid(useOrgSid);
         query.setRoleCode(roleCode);
         List<StaffByRole> data = sysStaffinfoFeign.getStaffNameByRoleCode(query).getData();
         if (!data.isEmpty()) {

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<String> roleCode;