bonus
/
Bonus-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

针对智慧工地对公司框架进行优化

This commit is contained in:
15856 2025-01-02 13:00:56 +08:00
parent d19533a19b
commit de5dcccd9a
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserRoleMapper.java
View File

@ -60,4 +60,10 @@ public interface SysUserRoleMapper
* @return 结果
*/
public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
/**
* 插入用户和角色关系表
* @param sysUserRole
*/
void insertUserRole(SysUserRole sysUserRole);
}

15
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
View File

@ -8,12 +8,14 @@ import java.util.stream.Collectors;
import com.bonus.common.core.web.domain.BaseEntity;
import com.bonus.config.SystemConfig;
import com.bonus.system.api.domain.SysUserRole;
import com.bonus.system.domain.SysRoleDept;
import com.bonus.system.domain.SysRoleMenu;
import com.bonus.system.mapper.*;
import com.bonus.common.datascope.utils.CommonDataPermissionInfo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.common.core.constant.UserConstants;
import com.bonus.common.core.exception.ServiceException;
@ -58,7 +60,7 @@ public class SysDeptServiceImpl implements ISysDeptService
private SystemConfig systemConfig;
@Resource
private SysUserServiceImpl sysUserServiceImpl;
private SysUserRoleMapper userRoleMapper;
/**
@ -316,6 +318,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* 创建公司管理员
*/
private void createRole(Long deptId,SysUser user) {
log.info("部门信息{}，用户信息{}",deptId,user);
SysRole role = new SysRole();
role.setRoleKey("admin");
role.setRoleName("系统管理员");
@ -333,10 +336,16 @@ public class SysDeptServiceImpl implements ISysDeptService
roleDeptList.add(rd);
roleDeptMapper.batchRoleDept(roleDeptList);
//用户绑定角色
Long[] roleIds = {role.getRoleId()};
sysUserServiceImpl.insertUserRole(user.getUserId(),roleIds);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setUserId(user.getUserId());
sysUserRole.setRoleId(role.getRoleId());
userRoleMapper.insertUserRole(sysUserRole);
List<SysRoleMenu> list = new ArrayList<>();
//对初始化管理员赋值菜单权限
SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(Long.valueOf(role.getRoleId()));
rm.setMenuId(1L);
list.add(rm);
SysRoleMenu rm1 = new SysRoleMenu();
rm1.setRoleId(Long.valueOf(role.getRoleId()));
rm1.setMenuId(100L);

2
bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java
View File

@ -472,6 +472,7 @@ public class SysUserServiceImpl implements ISysUserService {
* @param roleIds 角色组
*/
public void insertUserRole(Long userId, Long[] roleIds) {
log.info("用户id{}，角色id{}",userId,roleIds);
if (StringUtils.isNotEmpty(roleIds)) {
// 新增用户与角色管理
List<SysUserRole> list = new ArrayList<SysUserRole>();
@ -481,6 +482,7 @@ public class SysUserServiceImpl implements ISysUserService {
ur.setRoleId(roleId);
list.add(ur);
}
log.info("用户和角色关联关系{}",list);
userRoleMapper.batchUserRole(list);
}
}

2
bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.city,
d.district,
d.address,
d.deptAbbreviation,
d.dept_abbreviation,
d.remark,
d.logo
from sys_dept d

5
bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@ -30,7 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(#{item.userId},#{item.roleId})
</foreach>
</insert>
<insert id="insertUserRole">
insert into sys_user_role(user_id, role_id) values(#{userId},#{roleId})
</insert>
<delete id="deleteUserRoleInfo" parameterType="com.bonus.system.api.domain.SysUserRole">
delete from sys_user_role where user_id=#{userId} and role_id=#{roleId}
</delete>