Merge remote-tracking branch 'origin/main'

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<String, Object> params);
@@ -27,27 +27,27 @@ public interface RoleDao {
 	List<Role> list(@Param("params") Map<String, Object> 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<Role> 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<Long> 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<PublicBean> getList(PublicBean o);

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<String, Object> params);
@@ -37,7 +37,7 @@ public interface UserDao {
 	List<SysUser> list(@Param("params") Map<String, Object> 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<Long> roleIds);

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())

hn-ldlz/ldlz-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="name" column="name" />
 	</resultMap>
 
 	<resultMap type="DeptUserBo" id="SysDeptUserResult">
@@ -33,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<sql id="selectDeptVo">
         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,
 <!--			   if(d.dept_type='1', '岗位/职务', '分公司') dept_type_name,-->
 			   case d.dept_type when '1' then '岗位/职务' when '2' then '分公司' else '' end dept_type_name
         from bns_ldlz_sys_dept	 d