往来账款 获取企业类型

sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -103,6 +103,8 @@ public class OwnBillController extends BaseController {
         SysUser user = userInfo.getSysUser();
         //获取企业
         String companyId = user.getCompanyId();
+        //获取企业类型
+        String companyType = user.getCompanyType();
         Map map = new HashMap();
         //账款类型
         if("00".equals(zbiType)){
@@ -110,7 +112,7 @@ public class OwnBillController extends BaseController {
         }else if ("01".equals(zbiType)){
             map.put("payeeId", companyId);
         }
-        if (!SalaryConstants.OPEX.equals(companyId)) {
+        if (!"00".equals(companyType)) {
             map.put("companyId", companyId);
         }
         //账款名称
@@ -368,7 +370,7 @@ public class OwnBillController extends BaseController {
 
             LambdaQueryWrapper<ZcInvoiceInf> queryWrapper = new LambdaQueryWrapper<>();
             //时间格式化
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             //发票代码
             String ziiNo = jsonObject.getString("ziiNo");
             //发票号码