Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -279,6 +279,7 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         qw.eq("bor.state", 1);
         qw.eq("bo.nodeState", "已办结");
         qw.eq("ls.typeKey", "01");
+        qw.isNotNull("bor.vehCount");
         qw.orderByDesc("bo.createDate");
         IPage<BusNoGuaranteeCreditReviewVo> pagging = baseMapper.noGuaranteeCreditReviewPage(page, qw);
         PagerVo<BusNoGuaranteeCreditReviewVo> p = PagerUtil.pageToVo(pagging, null);

anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@@ -163,6 +163,15 @@ export function selectOrgList(data) {
   })
 }
 
+// 根据当前登录用户sid获取本分公司下的销售部门和销售专员(包含离职的销售专员)
+export function selectOrgList2(data) {
+  return request({
+    url: '//portal/v1/sysorganization/selectOrgList2',
+    method: 'get',
+    params: data
+  })
+}
+
 // 获取开票信息(限制有效期内)
 export function selectAllDisList(data) {
   return request({

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@@ -329,7 +329,7 @@
 <script>
 import { save, listAll, fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
 import Upload from '@/components/uploadFile/filesUpload' // 上传文件
-import { selAccountByOrgSid, typeValues, fetchDetailsByUseOrgSid, getOrgSidByPath, selectOrgList } from '@/api/jichuxinxi/dictcommons'
+import { selAccountByOrgSid, typeValues, fetchDetailsByUseOrgSid, getOrgSidByPath, selectOrgList2 } from '@/api/jichuxinxi/dictcommons'
 import amountpledged from '../paymentConfirmation/relation/amountpledged'
 
 export default {
@@ -464,7 +464,7 @@ export default {
           })
         }
       })
-      selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+      selectOrgList2({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
         if (res.success) {
           this.staffDept_list = res.data
         }

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);
+    }
 }