From a24a6f8e86f2a37df83241ef0766aaf32aed8b6c Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Wed, 4 Sep 2024 14:15:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=8A=A0=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SysDeptMapper.xml | 4 ++-- .../src/main/resources/mapper/system/SysUserMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 5454f31..ed5c19a 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 @@ -104,12 +104,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_dept( - dept_id,parent_id,dept_name,ancestors,order_num,leader,phone,email,status,create_by,company_id,create_time) + dept_id,parent_id,dept_name,ancestors,order_num,leader,phone,email,status,create_by,company_id,create_time,social_credit_code,enterprise_ownership_code) values ( #{item.deptId},#{item.parentId},#{item.deptName},#{item.ancestors},#{item.orderNum},#{item.leader}, - #{item.phone},#{item.email},#{item.status},#{item.createBy},#{item.companyId},sysdate() + #{item.phone},#{item.email},#{item.status},#{item.createBy},#{item.companyId},sysdate(),#{item.socialCreditCode},#{item.enterpriseOwnershipCode} ) 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 cea8447..d7a9170 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 @@ -51,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.social_credit_code as socialCreditCode,d.enterprise_ownership_code as enterpriseOwnershipCode + 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