菜单权限修改

yifu-permission/yifu-permission-biz/src/main/java/com/yifu/cloud/plus/v1/permission/service/impl/SysUserPermissionServiceImpl.java

@@ -261,12 +261,18 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 			// 执行数据插入操作 组装
 			for (int i = 0; i < excelVOList.size(); i++) {
 				SysUserPermissionVo excel = excelVOList.get(i);
+
 				//登录名校验
 				userInfo = userInfoList.stream().filter(e -> excel.getEmpLoginName().equals(e.getFdLoginName())).collect(Collectors.toList());
 				if (userInfo.isEmpty()) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "登录名填写错误，请核实", excel));
 					continue;
 				}
+
+				//从用户表中获取部门和用户名
+				SysUserInfo sysUserInfo = userInfo.get(0);
+				excel.setEmpDept(sysUserInfo.getFdDeptName());
+				excel.setEmpName(sysUserInfo.getFdName());
 				//判断表格权限类型是否正确
 				if (typeMap.isEmpty()) {
 					errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "获取权限类型字典值异常", excel));
@@ -293,6 +299,7 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 				} else {
 					uniqueMap.put(flag.toString(), CommonConstants.ONE_STRING);
 				}
+
 				//BU和条线的时候用名称判断，其他用编码判断
 				//判断此登录名是否已经存在此权限维度
 				if (CommonConstants.SIX_STRING.equals(excel.getPermissionType())
@@ -346,7 +353,6 @@ public class SysUserPermissionServiceImpl extends ServiceImpl<SysUserPermissionM
 						continue;
 					}
 				}
-
 				// 插入数据
 				insertExcel(excel);
 			}