企业开票信息管理

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -12,14 +12,16 @@ import lombok.Data;
 public class BaseDistributorListVo implements Vo {
     private static final long serialVersionUID = 7567158573644935938L;
 
-    private String name;
-    private String sid;
+    private String name;//名称
+    private String sid;//sid
 
-    private String registNum;//税号
+    private String registNum;//税号或身份证号
     private String registDetailAddress;//地址
     private String invoPhone;//开票联系电话
     private String invoBank;//开票开户行
     private String invoBankNum;//开票银行账号
 
-    private String openTickRemarks;
+    private String openTickRemarks;//拼接的开票信息
+
+    private String nameAndPhone;//个人名字手机号拼接
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -903,6 +903,9 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
             baseDistributorListVo.setName(crmCustomerTempListVo.getName());
             baseDistributorListVo.setSid(crmCustomerTempListVo.getSid());
             baseDistributorListVo.setOpenTickRemarks(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setRegistNum(crmCustomerTempListVo.getIdCard());
+            baseDistributorListVo.setInvoPhone(crmCustomerTempListVo.getMobile());
+            baseDistributorListVo.setNameAndPhone(crmCustomerTempListVo.getName() + crmCustomerTempListVo.getMobile());
             baseDistributorListVos.add(baseDistributorListVo);
         }
         return rb.success().setData(baseDistributorListVos);

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerBillApplicationDto.java

@@ -0,0 +1,50 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+
+import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
+import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户管理) <br/>
+ * File: CrmCustomerTempDto.java <br/>
+ * Class: com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto <br/>
+ * Description: 潜在客户信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-12 11:21:16 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "潜在客户信息 数据传输对象", description = "潜在客户信息 数据传输对象")
+@Data
+public class CrmCustomerBillApplicationDto implements Dto {
+
+    @ApiModelProperty("sid")
+    private String sid;
+
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("身份证号")
+    private String taxpayerNo;
+    @ApiModelProperty("电话")
+    private String phone;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+    @ApiModelProperty("业务员sid")
+    private String staffSid;
+    @ApiModelProperty("用户sid")
+    private String createBySid;
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -132,10 +133,10 @@ public class CrmCustomerTempDto implements Dto {
 
     //运营信息
     @ApiModelProperty(value = "运营信息")
-    private CrmBusinessDto crmBusinessDto;
+    private CrmBusinessDto crmBusinessDto = new CrmBusinessDto();
     //见证材料集合
     @ApiModelProperty(value = "见证材料的集合，编辑保存时无此字段")
-    private List<PcCrmVisitAppendixDto> crmVisitAppendixDtoList;
+    private List<PcCrmVisitAppendixDto> crmVisitAppendixDtoList = new ArrayList<>();
 
 
     private String orgPath;

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java

@@ -86,6 +86,16 @@ public interface CrmCustomerTempFeign {
     @PostMapping("/save")
     public ResultBean save(@Valid @RequestBody CrmCustomerTempDto dto);
 
+    /**
+     * 开票信息维护客户新增修改
+     *
+     * @return
+     */
+    @ApiOperation("开票信息维护客户新增修改")
+    @PostMapping("/billApplicatSaveCust")
+    public ResultBean billApplicatSaveCust(@Valid @RequestBody CrmCustomerBillApplicationDto dto);
+
+
     /**
      * pc端潜在客户编辑保存
      *

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java

@@ -67,8 +67,13 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 	public ResultBean save(CrmCustomerTempDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/save无法访问");
 	}
-      
-    @Override
+
+	@Override
+	public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+		return null;
+	}
+
+	@Override
 	public ResultBean update(CrmCustomerTempUpdateDto dto,String sid){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/update无法访问");
 	}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java

@@ -114,6 +114,11 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return crmCustomerTempService.saveCrmCustomer(dto);
     }
 
+    @Override
+    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+        return crmCustomerTempService.billApplicatSaveCust(dto);
+    }
+
     /**
      * 潜在客户修改保存
      *

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -995,11 +995,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             orgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             qw.eq("ct.createOrgSid", orgSid);
         }
-        if (StringUtils.isNotBlank(query.getCertificateTypeKey())){
+        if (StringUtils.isNotBlank(query.getCertificateTypeKey())) {
             qw.eq("ct.certificateTypeKey", query.getCertificateTypeKey());
         }
-        if (StringUtils.isNotBlank(query.getSearch())){
-            qw.like("ct.name",query.getSearch());
+        if (StringUtils.isNotBlank(query.getSearch())) {
+            qw.like("ct.name", query.getSearch());
         }
         qw.eq("ct.staffSid", staffSid);
         List<CrmCustomerTempListVo> list = baseMapper.selectCustomerList(qw);
@@ -1100,4 +1100,51 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         }
         return rb.success().setData(customerQuery.getCustomerNo());
     }
+
+    public ResultBean billApplicatSaveCust(CrmCustomerBillApplicationDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)){//新增
+
+        }
+        //手机号
+        String phone = dto.getPhone();
+        if (!phone.matches("^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$")) {
+            return rb.setMsg("手机号格式不正确");
+        }
+        if (!dto.getTaxpayerNo().matches("^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$")) {
+            return rb.setMsg("证件号码格式不正确");
+        }
+        //客户姓名
+        String name = dto.getName();
+        //业务员sid
+        String staffSid = dto.getStaffSid();
+        //生成客户编码：分公司简称+部门编码+手机号+姓名首字母大写拼写
+        String customerNo = getPrefix(staffSid, name, phone);
+        //查询该客户编码是否存在
+        CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerNo(customerNo);
+        if (crmCustomerTemp != null) {//存在
+            //查询该客户属于哪个业务员
+            String staffName = "";
+            SysUserVo sysCrmVo = sysUserFeign.fetchBySid(crmCustomerTemp.getCreateBySid()).getData();
+            if (sysCrmVo != null) {
+                staffName = sysCrmVo.getName();
+                return rb.setMsg("该客户已存在，为" + staffName + "销售专员客户");
+            }
+        } else {//不存在
+            // 新增
+            SysUserVo sysUserVo = new SysUserVo();
+            sysUserVo.setStaffSid(staffSid);
+            CrmCustomerTempDto crmCustomerTempDto = new CrmCustomerTempDto();
+            crmCustomerTempDto.setName(name);
+            crmCustomerTempDto.setIDNumber(dto.getTaxpayerNo());
+            crmCustomerTempDto.setMobile(phone);
+            crmCustomerTempDto.setUserSid(dto.getCreateBySid());
+            crmCustomerTempDto.setOrgPath(dto.getOrgSidPath());
+            crmCustomerTempDto.setCertificateTypeKey("01");
+            crmCustomerTempDto.setCertificateType("身份证");
+            saveCrmCustomerTemp(crmCustomerTempDto, sysUserVo);
+        }
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeign.java

@@ -102,7 +102,7 @@ public interface FinCompanyInvoicingFeign {
     @ApiOperation("企业开票信息管理根据名称模糊检索")
     @PostMapping("/qyFetchListByName")
     @ResponseBody
-    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name);
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(@RequestParam("name") String name,@RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("企业开票信息管理新增或保存")
     @PostMapping("/qySaveOrUpdate")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingFeignFallback.java

@@ -48,65 +48,65 @@ import java.util.List;
 @Component
 public class FinCompanyInvoicingFeignFallback implements FinCompanyInvoicingFeign {
 
-	@Override
-	public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(PagerQuery<FinCompanyInvoicingQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<FinCompanyInvoicingVo>> listPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincompanyinvoicing/listPage无法访问");
+    }
 
-	@Override
-	public ResultBean save(FinCompanyInvoicingDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
-	}
+    @Override
+    public ResultBean save(FinCompanyInvoicingDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/save无法访问");
+    }
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");
-	}
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincompanyinvoicing/delBySids无法访问");
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问");
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincompanyinvoicing/fetchDetailsBySid无法访问");
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> fetchDetailsByUseOrgSid(String useOrgSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<FinCompanyInvoicingDetailsVo> getDetailsByUseOrgAndSystem(String useOrgSid, String systemSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<List<InvoicingVo>> selectInvoingList(String busSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<FinCompanyInvoicingVo>> qyListPage(PagerQuery<FinCompanyInvoicingQuery> pq) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name) {
-		return null;
-	}
+    @Override
+    public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name, String useOrgSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
-		return null;
-	}
+    @Override
+    public ResultBean qySaveOrUpdate(FinCompanyInvoicingDto dto) {
+        return null;
+    }
 
-	@Override
-	public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(String orgSid) {
-		return null;
-	}
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qySelByUseOrgSid(String orgSid) {
+        return null;
+    }
 
-	@Override
-	public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
-		return null;
-	}
+    @Override
+    public List<FinCompanyInvoicingBillListVo> qyAppSelByUseOrgSid(String useOrgSid, String search) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingQuery.java

@@ -66,4 +66,6 @@ public class FinCompanyInvoicingQuery implements Query {
     private String name;
     @ApiModelProperty("纳税人识别号")
     private String taxpayerNo;
+
+    private String appName;//移动端查询条件
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java

@@ -56,8 +56,10 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
 	//@Update("update fin_company_invoicing set name=#{msg} where id=#{id}")
 	//IPage<FinCompanyInvoicingVo> voPage(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) QueryWrapper<FinCompanyInvoicing> qw);
 	
+	IPage<FinCompanyInvoicingVo> selectPageVoGS(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
+
 	IPage<FinCompanyInvoicingVo> selectPageVo(IPage<FinCompanyInvoicing> page, @Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
-	
+
 	List<FinCompanyInvoicingVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinCompanyInvoicing> qw);
 	
 	@Select("select * from fin_company_invoicing")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -3,6 +3,13 @@
 <mapper namespace="com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVoGS" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
+        SELECT fci.* FROM fin_company_invoicing fci
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
     <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingVo">
         SELECT fci.* FROM fin_company_invoicing fci
         <where>
@@ -37,6 +44,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
 
     <select id="selByUseOrgSidAndNameOrTaxNo"
@@ -45,6 +53,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
 
     <select id="qySelByUseOrgSid" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingBillListVo">
@@ -61,5 +70,8 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (purchaseSystemSid IS NULL OR LENGTH(purchaseSystemSid) = 0)
     </select>
+
+
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingRest.java

@@ -118,9 +118,9 @@ public class FinCompanyInvoicingRest implements FinCompanyInvoicingFeign {
 	}
 
 	@Override
-	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name) {
+	public ResultBean<List<FinCompanyInvoicingDetailsVo>> qyFetchListByName(String name,String useOrgSid) {
 		ResultBean rb = ResultBean.fireFail();
-		List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name);
+		List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = finCompanyInvoicingService.qyFetchListByName(name,useOrgSid);
 		return rb.success().setData(finCompanyInvoicingDetailsVos);
 	}
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -130,7 +130,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             qw.eq("fci.purchaseSystemSid", query.getPurchaseSystemSid());
         }
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
-        IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
+        IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVoGS(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -239,12 +239,15 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             return p;
         }
         //=======================
+        //PC查询条件
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("fci.name", query.getName());
         }
         if (StringUtils.isNotBlank(query.getTaxpayerNo())) {
             qw.like("fci.taxpayerNo", query.getTaxpayerNo());
         }
+        //移动端查询条件
+
         IPage<FinCompanyInvoicing> page = PagerUtil.queryToPage(pq);
         IPage<FinCompanyInvoicingVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<FinCompanyInvoicingVo> p = PagerUtil.pageToVo(pagging, null);
@@ -261,12 +264,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
             QueryWrapper qw1 = new QueryWrapper<>();
             qw1.eq("useOrgSid", useOrgSid);
             qw1.eq("name", name);
-            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
             QueryWrapper qw2 = new QueryWrapper<>();
             qw2.eq("useOrgSid", useOrgSid);
             qw2.eq("taxpayerNo", taxpayerNo);
-            qw1.isNull("purchaseSystemSid");
             FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
             if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
                 return rb.setMsg("该企业开票信息已存在");
@@ -278,13 +279,11 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         qw1.eq("useOrgSid", useOrgSid);
         qw1.notIn("sid", dtoSid);
         qw1.eq("name", name);
-        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo1 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw1);
         QueryWrapper qw2 = new QueryWrapper<>();
         qw2.eq("useOrgSid", useOrgSid);
         qw1.notIn("sid", dtoSid);
         qw2.eq("taxpayerNo", taxpayerNo);
-        qw1.isNull("purchaseSystemSid");
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo2 = baseMapper.selByUseOrgSidAndNameOrTaxNo(qw2);
         if (finCompanyInvoicingDetailsVo1 != null || finCompanyInvoicingDetailsVo2 != null) {
             return rb.setMsg("该企业开票信息已存在");
@@ -293,8 +292,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         return rb.success();
     }
 
-    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name) {
+    public List<FinCompanyInvoicingDetailsVo> qyFetchListByName(String name,String useOrgSid) {
         QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("useOrgSid", useOrgSid);
+        qw.eq("isDelete", 0);
         qw.like("name", name);
         List<FinCompanyInvoicingDetailsVo> finCompanyInvoicingDetailsVos = baseMapper.qyFetchListByName(qw);
         return finCompanyInvoicingDetailsVos;
@@ -304,7 +305,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", orgSid);
         qw.eq("isDelete", 0);
-        qw.isNull("purchaseSystemSid");
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;
     }
@@ -313,7 +313,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("useOrgSid", useOrgSid);
         qw.eq("isDelete", 0);
-        qw.isNull("purchaseSystemSid");
         qw.like("name",search);
         List<FinCompanyInvoicingBillListVo> finCompanyInvoicingBillListVos = baseMapper.qySelByUseOrgSid(qw);
         return finCompanyInvoicingBillListVos;