开票列表加数据权限

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwInvoiceApiController.java

@@ -68,13 +68,18 @@ public class HlwInvoiceApiController extends JeecgController<HlwInvoice, IHlwInv
         Integer pageSize = jsonObject.getInteger("pageSize");
         String paymentCode = jsonObject.getString("paymentCode");
         String subcontractorName = jsonObject.getString("subcontractorName");
-        Integer invoiceStatus = jsonObject.getInteger("invoiceStatus");;
+        Integer invoiceStatus = jsonObject.getInteger("invoiceStatus");
+        JSONArray jsonArray = jsonObject.getJSONArray("companyCodeList");
+        List<String> companyCodeList = new ArrayList<>();
+        for (int i = 0; i < jsonArray.size(); i++) {
+            companyCodeList.add(jsonArray.get(i).toString());
+        }
         Page<HlwSubcontractorAccountFlow> page = new Page<HlwSubcontractorAccountFlow>(pageNo, pageSize);
         HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow=new HlwSubcontractorAccountFlow();
         hlwSubcontractorAccountFlow.setPaymentCode(paymentCode);
         hlwSubcontractorAccountFlow.setSubcontractorName(subcontractorName);
         hlwSubcontractorAccountFlow.setInvoiceStatus(invoiceStatus);
-        Page<HlwSubcontractorAccountFlow> pageList = hlwSubcontractorAccountFlowService.invoiceApplyList(page,hlwSubcontractorAccountFlow, applicationId);
+        Page<HlwSubcontractorAccountFlow> pageList = hlwSubcontractorAccountFlowService.invoiceApplyList(page,hlwSubcontractorAccountFlow, applicationId,companyCodeList);
         return Result.ok(pageList);
     }
 

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/HlwSubcontractorAccountFlowMapper.java

@@ -29,5 +29,5 @@ public interface HlwSubcontractorAccountFlowMapper extends BaseMapper<HlwSubcont
 
     List<HlwSubcontractorAccountFlow> invoiceDetailsList(Page<HlwSubcontractorAccountFlow> page,@Param("hlwSubcontractorAccountFlow") HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow,@Param(Constants.WRAPPER) QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 
-    List<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page,@Param("hlwSubcontractorAccountFlow")  HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, @Param("applicationId") Integer applicationId);
+    List<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page,@Param("hlwSubcontractorAccountFlow")  HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, @Param("applicationId") Integer applicationId,@Param("companyCodeList")List<String> companyCodeList);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/mapper/xml/HlwSubcontractorAccountFlowMapper.xml

@@ -375,6 +375,12 @@
                     and a.invoice_id is not null
                 </if>
             </if>
+            <if test="companyCodeList != null and companyCodeList.size() != 0">
+                and hc.company_code in
+                <foreach collection="companyCodeList" index="index" item="code" open="(" separator="," close=")">
+                    #{code}
+                </foreach>
+            </if>
         </where>
         group by a.id
         ORDER BY a.update_time DESC, a.id ASC

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/IHlwSubcontractorAccountFlowService.java

@@ -27,5 +27,5 @@ public interface IHlwSubcontractorAccountFlowService extends IService<HlwSubcont
 
     Page<HlwSubcontractorAccountFlow> invoiceDetailsList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, QueryWrapper<HlwSubcontractorAccountFlow> queryWrapper);
 
-    Page<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, Integer applicationId);
+    Page<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, Integer applicationId,List<String> companyCodeList);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwsubcontractor/service/impl/HlwSubcontractorAccountFlowServiceImpl.java

@@ -43,8 +43,8 @@ public class HlwSubcontractorAccountFlowServiceImpl extends ServiceImpl<HlwSubco
     }
 
     @Override
-    public Page<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, Integer applicationId) {
-        return page.setRecords(baseMapper.invoiceApplyList(page, hlwSubcontractorAccountFlow, applicationId));
+    public Page<HlwSubcontractorAccountFlow> invoiceApplyList(Page<HlwSubcontractorAccountFlow> page, HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow, Integer applicationId,List<String> companyCodeList) {
+        return page.setRecords(baseMapper.invoiceApplyList(page, hlwSubcontractorAccountFlow, applicationId,companyCodeList));
     }
 
     @Override