Merge remote-tracking branch 'origin/release' into release

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -585,6 +585,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             DynamicContextHolder.push(DbConstant.BASICS_READ);
 
             SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode);
+            log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
             reimburse.setGfTaxNo(orgByCompCode.getTaxno());
             reimburse.setGfName(orgByCompCode.getTaxname());
             reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone());
@@ -592,8 +593,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
             reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);
 
-
-
             DynamicContextHolder.push("business" + DbConstant.BUSINESS_WRITE);
             int insert = 0;
             QueryWrapper wrapper = new QueryWrapper();

dxhy-erp/src/main/resources/mapper/SysDeptDao.xml

@@ -31,7 +31,7 @@
     <select id="getOrgByCompCode" resultType="com.dxhy.erp.entity.SysDeptEntity">
         select *
         from sys_dept
-        where comp_code = #{compCode}
+        where org_code = #{compCode}
           and org_type = '5'
           and del_flag = '0' limit 1
     </select>