From f77a068a9515b9100cf653989386759ef54274c5 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Fri, 11 Aug 2023 10:16:46 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20userInfo=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=A8=8E=E5=8F=B7=E5=92=8CdeptId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dxhy/admin/sys/entity/SysCompanyEntity.java  | 2 ++
 .../dxhy/admin/sys/service/impl/SysUserServiceImpl.java   | 8 ++++----
 .../src/main/resources/mapper/sys/SysUserOrgDao.xml       | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java
index da980e50..e5e5d76c 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java
@@ -11,4 +11,6 @@ public class SysCompanyEntity {
 
     //组织名称
     private String companyName;
+    private String deptId;
+    private String taxno;
 }
diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
index b3ac2d73..cbcd19fa 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
@@ -294,10 +294,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                         }
                     }
                 }
-                SysCompanyEntity company = new SysCompanyEntity();
-                company.setCompanyName("()暂无组织编码发票");
-                company.setCompanyCode("88");
-                companyEntitys.add(company);
+//                SysCompanyEntity company = new SysCompanyEntity();
+//                company.setCompanyName("()暂无组织编码发票");
+//                company.setCompanyCode("88");
+//                companyEntitys.add(company);
             }
 
             user = this.toUser(user, userEntity);
diff --git a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml
index 85a79455..1c7076d7 100644
--- a/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml
+++ b/dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml
@@ -74,7 +74,7 @@
     </update>
 
     <select id="getOrgsByUserId" parameterType="long" resultType="com.dxhy.admin.sys.entity.SysCompanyEntity">
-        select dept.org_code as companyCode,dept.name as companyName from sys_user_org org
+        select dept.org_code as companyCode,dept.name as companyName,dept.dept_id as deptId,dept.taxno taxno from sys_user_org org
         inner join sys_dept dept on org.dept_id = dept.dept_id
         where org.userid = #{userId}
     </select>