包含离职人员的销售专员及部门

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -155,6 +155,11 @@ public interface SysOrganizationFeign {
     @ApiOperation("当前分公司销售部门及部门人员")
     ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query);
 
+    @GetMapping("/selectOrgList2")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList2(@SpringQueryMap SysOrganizationListQuery query);
+
     @GetMapping("/selectOrgLists")
     @ResponseBody
     @ApiOperation("当前分公司下所有部门")

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -157,6 +157,11 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -126,4 +126,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
 
     List<SysFinanceVo> selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid2(String orgDeptSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -196,6 +196,14 @@
           and si.personTypeKey != '01'
     </select>
 
+    <select id="selectByOrgDeptSid2" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid, su.sid userSid
+        from sys_staff_org so
+        left join sys_staffinfo si on so.staffSid = si.sid
+        left join sys_user su on su.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
+
     <select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">
         select *
         from sys_organization

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -413,6 +413,11 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         return sysOrganizationService.selectOrgList(query);
     }
 
+    @Override
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        return sysOrganizationService.selectOrgList2(query);
+    }
+
     @Override
     public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
         return sysOrganizationService.selectOrgLists(query);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -691,4 +691,27 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         return rb.success().setData(orgPath);
     }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList2(SysOrganizationListQuery query) {
+        ResultBean<List<SysOrganizationListVo>> rb = ResultBean.fireFail();
+        String orgSid = "";
+        String orgDeptSid = "";
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
+        } else {
+            orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
+            orgSid = getOrgSid(orgDeptSid);
+        }
+        //根据分公司名称查询销售部门的部门
+        List<SysOrganizationListVo> sysOrganizationListVos = baseMapper.selectOrgList(orgSid);
+        sysOrganizationListVos.removeAll(Collections.singleton(null));
+        if (!sysOrganizationListVos.isEmpty()) {
+            for (SysOrganizationListVo vo : sysOrganizationListVos) {
+                orgDeptSid = vo.getOrgDeptSid();
+                List<SysOrgStaffVo> sysOrgStaffVoList = baseMapper.selectByOrgDeptSid2(orgDeptSid);
+                vo.setStaffinfoVoList(sysOrgStaffVoList);
+            }
+        }
+        return rb.success().setData(sysOrganizationListVos);
+    }
 }