From 16f7b4b0865f573794099aba8b51fb6b29080d06 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 8 May 2023 21:51:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java index 7c36c7b6..f5c53f41 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/LoginServiceImpl.java +++ b/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 sysCompanyEntities = sysUserOrgService.getOrgsByUserId(userEntity.getUserId()); + log.info("查询到的组织机构编码和名称{}",sysCompanyEntities); List orgs = new ArrayList<>(); if (sysCompanyEntities != null && sysCompanyEntities.size() > 0){ for (SysCompanyEntity sysCompanyEntity : sysCompanyEntities) { orgs.add(sysCompanyEntity.getCompanyCode()); } } + log.info("封装的组织机构编码{}",orgs); userInfo.setCompanyCodes(orgs); } From e35935a95633c8341e2dad00e6e44fd4738436d4 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 8 May 2023 22:17:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml index 57e81297..7bf78ae8 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml @@ -74,9 +74,11 @@ From d43bc7497f046e91d3d18fc63b6e97614e54433d Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Mon, 8 May 2023 22:50:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/sys/SysUserOrgDao.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml index 7bf78ae8..3de6a55d 100644 --- a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml +++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml @@ -73,12 +73,9 @@ From a038bbec7fbbb19176a0569499e38d75593c7f76 Mon Sep 17 00:00:00 2001 From: yishiqihuasheng <1191093413@qq.com> Date: Tue, 9 May 2023 08:37:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java | 4 ++++ .../src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java | 2 ++ dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml | 3 ++- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index 31cc8cac..a1acd936 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/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; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java index bf0ec0f1..a2ede5aa 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java +++ b/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; } diff --git a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml index d4730397..1c646673 100644 --- a/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml @@ -49,6 +49,7 @@ + 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, diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 41f86dfe..775a2001 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -31,6 +31,7 @@ + @@ -57,7 +58,7 @@