diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
index fea5c0c..6d2482c 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
@@ -75,6 +75,12 @@ public class SysDept extends BaseEntity
/** 所属组织id */
private Long companyId;
+ /** 企业机构代码(统一社会信用代码) */
+ private String socialCreditCode;
+
+ /** 企业归属代码 CSG-南方电网下属企业 SE-社会及大集体企业 */
+ private String enterpriseOwnershipCode;
+
@Override
public String getRemark() {
return remark;
@@ -93,6 +99,22 @@ public class SysDept extends BaseEntity
this.companyId = companyId;
}
+ public String getSocialCreditCode() {
+ return socialCreditCode;
+ }
+
+ public void setSocialCreditCode(String socialCreditCode) {
+ this.socialCreditCode = socialCreditCode;
+ }
+
+ public String getEnterpriseOwnershipCode() {
+ return enterpriseOwnershipCode;
+ }
+
+ public void setEnterpriseOwnershipCode(String enterpriseOwnershipCode) {
+ this.enterpriseOwnershipCode = enterpriseOwnershipCode;
+ }
+
public Long getDeptId()
{
return deptId;
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 21c037f..5454f31 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -22,11 +22,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time,
- d.remark,d.company_id
+ d.remark,d.company_id,d.social_credit_code,d.enterprise_ownership_code
from sys_dept d
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
index d745955..cea8447 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.company_id,
- d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+ d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, d.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id