From 58323abe2f40fb09bea1ae825d72b020d8b7f4f1 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Fri, 19 Dec 2025 09:55:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../capacity/backstage/manager/dao/RoleDao.java | 16 ++++++++-------- .../capacity/backstage/manager/dao/UserDao.java | 6 +++--- .../bns/common/core/domain/entity/SysDept.java | 10 ++++++++++ .../resources/mapper/system/SysDeptMapper.xml | 3 ++- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/RoleDao.java b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/RoleDao.java index c483c26..b4b12cf 100644 --- a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/RoleDao.java +++ b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/RoleDao.java @@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Update; public interface RoleDao { @Options(useGeneratedKeys = true, keyProperty = "id") - @Insert("insert into sys_role(name, description, role_power, role_level, createTime, updateTime, is_active) values(#{name}, #{description}, CONCAT(#{backend}, ',', #{screen}), #{level}, now(),now(), 1)") + @Insert("insert into bns_czl_sys_role(name, description, role_power, role_level, createTime, updateTime, is_active) values(#{name}, #{description}, CONCAT(#{backend}, ',', #{screen}), #{level}, now(),now(), 1)") int save(Role role); int count(@Param("params") Map params); @@ -27,27 +27,27 @@ public interface RoleDao { List list(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); - @Select("select t.name,t.role_level as level,t.description,t.role_power as rolePower from sys_role t where t.id = #{id}") + @Select("select t.name,t.role_level as level,t.description,t.role_power as rolePower from bns_czl_sys_role t where t.id = #{id}") Role getById(Long id); - @Select("select * from sys_role t where t.name = #{name} and t.is_active = '1'") + @Select("select * from bns_czl_sys_role t where t.name = #{name} and t.is_active = '1'") Role getRole(String name); - @Update("update sys_role t set t.name = #{name}, t.description = #{description}, t.role_power = CONCAT(#{backend}, ',', #{screen}), t.role_level = #{level}, updateTime = now() where t.id = #{id}") + @Update("update bns_czl_sys_role t set t.name = #{name}, t.description = #{description}, t.role_power = CONCAT(#{backend}, ',', #{screen}), t.role_level = #{level}, updateTime = now() where t.id = #{id}") int update(Role role); - @Select("select * from sys_role r inner join sys_role_user ru on r.id = ru.roleId where ru.userId = #{userId}") + @Select("select * from bns_czl_sys_role r inner join bns_czl_sys_role_user ru on r.id = ru.roleId where ru.userId = #{userId}") List listByUserId(Long userId); - @Delete("delete from sys_role_permission where roleId = #{roleId}") + @Delete("delete from bns_czl_sys_role_permission where roleId = #{roleId}") int deleteRolePermission(Long roleId); int saveRolePermission(@Param("roleId") Long roleId, @Param("permissionIds") List permissionIds); - @Delete("delete from sys_role where id = #{id}") + @Delete("delete from bns_czl_sys_role where id = #{id}") int delete(Long id); - @Delete("delete from sys_role_user where roleId = #{roleId}") + @Delete("delete from bns_czl_sys_role_user where roleId = #{roleId}") int deleteRoleUser(Long roleId); List getList(PublicBean o); diff --git a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/UserDao.java b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/UserDao.java index 5e891c9..e792ad5 100644 --- a/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/UserDao.java +++ b/hn-czl-service/src/main/java/com/bonus/hn/bearing/capacity/backstage/manager/dao/UserDao.java @@ -16,7 +16,7 @@ import java.util.Map; public interface UserDao { @Options(useGeneratedKeys = true, keyProperty = "id") - @Insert("insert into sys_user(username, password, type, phone, sex, status, createTime, updateTime) values(#{username}, #{password}, #{nickname}, #{phone}, #{sex}, #{status}, now(), now())") + @Insert("insert into bns_czl_sys_user(username, password, type, phone, sex, status, createTime, updateTime) values(#{username}, #{password}, #{nickname}, #{phone}, #{sex}, #{status}, now(), now())") int save(SysUser user); /** @@ -29,7 +29,7 @@ public interface UserDao { SysUser getUser(@Param("username") String username); - @Update("update sys_user t set t.password = #{password} where t.id = #{id}") + @Update("update bns_czl_sys_user t set t.password = #{password} where t.id = #{id}") int changePassword(@Param("id") Long id, @Param("password") String password); Integer count(@Param("params") Map params); @@ -37,7 +37,7 @@ public interface UserDao { List list(@Param("params") Map params, @Param("offset") Integer offset, @Param("limit") Integer limit); - @Delete("delete from sys_role_user where userId = #{userId}") + @Delete("delete from bns_czl_sys_role_user where userId = #{userId}") int deleteUserRole(Long userId); int saveUserRoles(@Param("userId") Long userId, @Param("roleIds") List roleIds); diff --git a/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java b/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java index ef13b20..1229919 100644 --- a/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java +++ b/hn-ldlz/ldlz-common/src/main/java/com/bns/common/core/domain/entity/SysDept.java @@ -34,6 +34,7 @@ public class SysDept extends BaseEntity { /** 部门名称 */ private String deptName; + private String name; /** 显示顺序 */ private Integer orderNum; @@ -207,6 +208,14 @@ public class SysDept extends BaseEntity { this.children = children; } + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -214,6 +223,7 @@ public class SysDept extends BaseEntity { .append("parentId", getParentId()) .append("ancestors", getAncestors()) .append("deptName", getDeptName()) + .append("name", getName()) .append("orderNum", getOrderNum()) .append("leader", getLeader()) .append("phone", getPhone()) diff --git a/hn-ldlz/ldlz-system/src/main/resources/mapper/system/SysDeptMapper.xml b/hn-ldlz/ldlz-system/src/main/resources/mapper/system/SysDeptMapper.xml index 389b6da..f18915d 100644 --- a/hn-ldlz/ldlz-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/hn-ldlz/ldlz-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -33,7 +34,7 @@ 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.dept_type, + d.dept_type,d.dept_name as name, case d.dept_type when '1' then '岗位/职务' when '2' then '分公司' else '' end dept_type_name from bns_ldlz_sys_dept d