Merge branch '0507' into release

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java

@@ -167,13 +167,16 @@ public class LoginServiceImpl implements LoginService {
                 }
                 log.debug("是否签收后认证：{} , 数据源：{} ， 系统类型：{}", userInfo.getQsStatus(), userInfo.getDbName(),
                     userInfo.getProductType());
+
                 List<SysCompanyEntity> sysCompanyEntities = sysUserOrgService.getOrgsByUserId(userEntity.getUserId());
+                log.info("查询到的组织机构编码和名称{}",sysCompanyEntities);
                 List<String> orgs = new ArrayList<>();
                 if (sysCompanyEntities != null && sysCompanyEntities.size() > 0){
                     for (SysCompanyEntity sysCompanyEntity : sysCompanyEntities) {
                         orgs.add(sysCompanyEntity.getCompanyCode());
                     }
                 }
+                log.info("封装的组织机构编码{}",orgs);
                 userInfo.setCompanyCodes(orgs);
 
             }

dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml

@@ -73,10 +73,9 @@
     </update>
 
     <select id="getOrgsByUserId" parameterType="long" resultType="com.dxhy.admin.sys.entity.SysCompanyEntity">
-        select d.org_code companyCode, d.name companyName
-        from sys_user_org o left join sys_dept d
-        on o.dept_id = d.dept_id
-        where o.userid = userId
+        select dept.org_code as companyCode,dept.name as companyName from sys_user_org org
+        inner join sys_dept dept on org.dept_id = dept.dept_id
+        where org.userid = #{userId}
     </select>
 
 </mapper>

dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java

@@ -512,4 +512,8 @@ public class BaseTDxRecordInvoice implements Serializable {
     private String imageNumber;
     //报账单号
     private String bzdh;
+    /**
+     * 组织编码
+     */
+    private String compCode;
 }

dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java

@@ -207,6 +207,8 @@ public class BaseFpRzRespVO implements Serializable {
     private String bzdh;
     //组织名称
     private String deptName;
+    //组织编码
+    private String compCode;
 
 
 }

dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml

@@ -49,6 +49,7 @@
         <result column="voucher_number" property="voucherNumber"/>
         <result column="sn_voucher_number" property="snVoucherNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
 
     <resultMap id="RzcxhjResultMap"
@@ -62,7 +63,7 @@
             resultMap="BaseResultMap" databaseId="mysql">
         select
         t.invoice_code,t.invoice_no,t.invoice_type,DATE_FORMAT(t.invoice_date,'%Y-%m-%d')kprq,t.gf_tax_no,t.gf_name,t.image_id,
-        t.dept_id deptId,t.dept_name deptName,
+        t.dept_id deptId,t.dept_name deptName,t.comp_code,
         t.xf_tax_no,t.xf_name,t.tax_amount,t.dk_tax_amount,t.invoice_status,t.invoice_amount,date_format(t.rzh_date,'%Y-%m-%d') rzh_date,
         date_format(t.qs_date,'%Y-%m-%d') qs_date,t.rzh_type,t.id id,
         t.gx_user_name,t.rzh_belong_date,t.inaccount_status,t.bzdh,

dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

@@ -31,6 +31,7 @@
         <result column="image_id" property="imageNumber"/>
         <result column="ele_invoice_no" property="eleInvoiceNo"/>
         <result column="bzdh" property="bzdh"/>
+        <result column="comp_code" property="compCode"/>
     </resultMap>
     <resultMap id="hjResultMap"
                type="com.dxhy.base.entity.BaseTDxRecordInvoice">
@@ -57,7 +58,7 @@
     </select>
     <select id="selectSggxcx" parameterType="java.util.Map"
             resultMap="SggxcxResultMap" databaseId="mysql">
-        select t.invoice_type,t.dept_id,t.dept_name
+        select t.invoice_type,t.dept_id,t.dept_name,t.comp_code
         ,t.id,t.invoice_code,t.invoice_no,t.gf_name,t.gf_tax_no,t.xf_name,
         DATE_FORMAT(t.invoice_date,'%Y-%m-%d')invoice_date,t.invoice_amount,t.tax_amount,t.invoice_status,DATE_FORMAT(t.qs_date,'%Y-%m-%d')qs_date
         ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period,