提交修改

blade-service/blade-client/src/main/java/org/springblade/client/container/controller/ContainerController.java

@@ -87,7 +87,7 @@ public class ContainerController
 		containerType.setTenantId(AuthUtil.getTenantId());
 		containerType.setCreateTime(new Date());
 		containerType.setCreateUser(SecureUtil.getUserId());
-		containerType.setCreateUserName(SecureUtil.getUser().getRoleName());
+		containerType.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicContainerTypeService.save(containerType);
 		return R.success("操作成功");
 	}
@@ -97,7 +97,7 @@ public class ContainerController
 	{
 		containerType.setUpdateTime(new Date());
 		containerType.setUpdateUser(SecureUtil.getUserId());
-		containerType.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		containerType.setUpdateUserName(SecureUtil.getUser().getUserName());
 		basicContainerTypeService.updateById(containerType);
 		return R.success("操作成功");
 	}
@@ -137,7 +137,7 @@ public class ContainerController
 	{   dto.setTenantId(AuthUtil.getTenantId());
 		dto.setCreateTime(new Date());
 		dto.setCreateUser(SecureUtil.getUserId());
-		dto.setCreateUserName(SecureUtil.getUser().getRoleName());
+		dto.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicContainerDescService.addBasicContainerDesc(dto);
 		return R.success("操作成功");
 	}
@@ -147,7 +147,7 @@ public class ContainerController
 	{
 		body.setUpdateTime(new Date());
 		body.setUpdateUser(SecureUtil.getUserId());
-		body.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		body.setUpdateUserName(SecureUtil.getUser().getUserName());
 		basicContainerDescService.updateBasicPortDesc(body);
 		return R.success("操作成功");
 	}

blade-service/blade-client/src/main/java/org/springblade/client/container/service/imp/BasicContainerDescServiceImpl.java

@@ -54,7 +54,7 @@ public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContaine
 		 BeanUtils.copyProperties(dto,target);
 		 target.setCreateTime(new Date());
 		 target.setCreateUser(SecureUtil.getUserId());
-		 target.setCreateUserName(SecureUtil.getUser().getRoleName());
+		 target.setCreateUserName(SecureUtil.getUser().getUserName());
 		 basicContainerDescMapper.insert(target);
 
 		 BasicContainerTypeDesc middle=new BasicContainerTypeDesc();
@@ -62,7 +62,7 @@ public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContaine
 		 middle.setContainerTypeId(typeId);
 		 middle.setCreateTime(new Date());
 		 middle.setCreateUser(SecureUtil.getUserId());
-		 middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+		 middle.setCreateUserName(SecureUtil.getUser().getUserName());
 		 basicContainerTypeDescMapper.insert(middle);
 	}
 
@@ -106,7 +106,7 @@ public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContaine
 				middle.setContainerTypeId(typeId);
 				middle.setCreateTime(new Date());
 				middle.setCreateUser(SecureUtil.getUserId());
-				middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+				middle.setCreateUserName(SecureUtil.getUser().getUserName());
 				basicContainerTypeDescMapper.insert(middle);
 
 
@@ -124,7 +124,7 @@ public class BasicContainerDescServiceImpl extends BaseServiceImpl<BasicContaine
 			middle.setContainerTypeId(typeId);
 			middle.setCreateTime(new Date());
 			middle.setCreateUser(SecureUtil.getUserId());
-			middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+			middle.setCreateUserName(SecureUtil.getUser().getUserName());
 			basicContainerTypeDescMapper.insert(middle);
 		}
 

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -74,7 +74,7 @@ public class PortController
 		dto.setTenantId(AuthUtil.getTenantId());
 		dto.setCreateTime(new Date());
 		dto.setCreateUser(SecureUtil.getUserId());
-		dto.setCreateUserName(SecureUtil.getUser().getRoleName());
+		dto.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicPortDescService.addBasicPortDesc(dto);
         return R.success("操作成功");
 	}
@@ -84,7 +84,7 @@ public class PortController
 	{
 		body.setUpdateTime(new Date());
 		body.setUpdateUser(SecureUtil.getUserId());
-		body.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		body.setUpdateUserName(SecureUtil.getUser().getUserName());
 		basicPortDescService.updateBasicPortDesc(body);
 		return R.success("操作成功");
 	}
@@ -153,7 +153,7 @@ public class PortController
 		portType.setTenantId(AuthUtil.getTenantId());
 		portType.setCreateTime(new Date());
 		portType.setCreateUser(SecureUtil.getUserId());
-		portType.setCreateUserName(SecureUtil.getUser().getRoleName());
+		portType.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicPortTypeService.save(portType);
 		return R.success("操作成功");
 	}
@@ -163,7 +163,7 @@ public class PortController
 	{
 		portType.setUpdateTime(new Date());
 		portType.setUpdateUser(SecureUtil.getUserId());
-		portType.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		portType.setUpdateUserName(SecureUtil.getUser().getUserName());
 		basicPortTypeService.updateById(portType);
 		return R.success("操作成功");
 	}

blade-service/blade-client/src/main/java/org/springblade/client/port/service/impl/BasicPortDescServiceImpl.java

@@ -59,7 +59,7 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
 		BeanUtils.copyProperties(dto,basicPortDesc);
 		basicPortDesc.setCreateTime(new Date());
 		basicPortDesc.setCreateUser(SecureUtil.getUserId());
-		basicPortDesc.setCreateUserName(SecureUtil.getUser().getRoleName());
+		basicPortDesc.setCreateUserName(SecureUtil.getUser().getUserName());
 
 		basicPortDescMapper.insert(basicPortDesc);
 
@@ -69,7 +69,7 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
 		middle.setPortsTypeId(typeId);
 		middle.setCreateTime(new Date());
 		middle.setCreateUser(SecureUtil.getUserId());
-		middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+		middle.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicPortTypeDescMapper.insert(middle);
 
 
@@ -114,7 +114,7 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
 				middle.setPortsTypeId(typeId);
 				middle.setCreateTime(new Date());
 				middle.setCreateUser(SecureUtil.getUserId());
-				middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+				middle.setCreateUserName(SecureUtil.getUser().getUserName());
 				basicPortTypeDescMapper.insert(middle);
 			}
 
@@ -128,7 +128,7 @@ public class BasicPortDescServiceImpl extends BaseServiceImpl<BasicPortDescMappe
 			middle.setPortsTypeId(typeId);
 			middle.setCreateTime(new Date());
 			middle.setCreateUser(SecureUtil.getUserId());
-			middle.setCreateUserName(SecureUtil.getUser().getRoleName());
+			middle.setCreateUserName(SecureUtil.getUser().getUserName());
 			basicPortTypeDescMapper.insert(middle);
 		}
 

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectFilesController.java

@@ -31,7 +31,7 @@ public class ProjectFilesController
 		serviceProjectFiles.setTenantId(AuthUtil.getTenantId());
 		serviceProjectFiles.setCreateTime(new Date());
 		serviceProjectFiles.setCreateUser(SecureUtil.getUserId());
-		serviceProjectFiles.setCreateUserName(SecureUtil.getUser().getRoleName());
+		serviceProjectFiles.setCreateUserName(SecureUtil.getUser().getUserName());
 		filesService.save(serviceProjectFiles);
 		return R.success("保存成功");
 	}
@@ -48,7 +48,7 @@ public class ProjectFilesController
 	{
 		serviceProjectFiles.setUpdateUser(SecureUtil.getUserId());
 		serviceProjectFiles.setUpdateTime(new Date());
-		serviceProjectFiles.setUpdateUserName(SecureUtil.getUser().getRoleName());
+		serviceProjectFiles.setUpdateUserName(SecureUtil.getUser().getUserName());
 		filesService.updateById(serviceProjectFiles);
 		return R.success("操作成功");
 	}

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -63,7 +63,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 		  serviceProject.setTenantId(AuthUtil.getTenantId());
 		  serviceProject.setCreateTime(new Date());
 		  serviceProject.setCreateUser(SecureUtil.getUserId());
-		  serviceProject.setCreateUserName(SecureUtil.getUser().getRoleName());
+		  serviceProject.setCreateUserName(SecureUtil.getUser().getUserName());
 		  serviceProjectMapper.insert(serviceProject);
 		  if(!CollectionUtils.isEmpty(itemList))
 		  {
@@ -72,7 +72,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 			  	e.setPId(serviceProject.getId());
                 e.setCreateTime(new Date());
                 e.setCreateUser(SecureUtil.getUserId());
-				  e.setCreateUserName(SecureUtil.getUser().getRoleName());
+				  e.setCreateUserName(SecureUtil.getUser().getUserName());
                 serviceProjectItemMapper.insert(e);
 			  });
 		  }
@@ -84,7 +84,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 				  e.setPId(serviceProject.getId());
 				  e.setCreateTime(new Date());
 				  e.setCreateUser(SecureUtil.getUserId());
-				  e.setCreateUserName(SecureUtil.getUser().getRoleName());
+				  e.setCreateUserName(SecureUtil.getUser().getUserName());
 				  serviceProjectFilesMapper.insert(e);
 			  });
 		  }
@@ -112,7 +112,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 				  {
 					  ls.setUpdateUser(SecureUtil.getUserId());
 					  ls.setUpdateTime(new Date());
-					  ls.setUpdateUserName(SecureUtil.getUser().getRoleName());
+					  ls.setUpdateUserName(SecureUtil.getUser().getUserName());
 					  serviceProjectItemMapper.updateById(ls);
 				  }
 				  //新增
@@ -124,7 +124,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 					  ls.setCreateUser(SecureUtil.getUserId());
 					  String deptId = SecureUtil.getDeptId();
 					  ls.setCreateDept(StringUtils.isNoneBlank(deptId)?Long.valueOf(deptId):-1);
-					  ls.setCreateUserName(SecureUtil.getUser().getRoleName());
+					  ls.setCreateUserName(SecureUtil.getUser().getUserName());
 					  serviceProjectItemMapper.insert(ls);
 				  }
 			  });
@@ -138,7 +138,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 					  {
 						  ls.setUpdateUser(SecureUtil.getUserId());
 						  ls.setUpdateTime(new Date());
-						  ls.setUpdateUserName(SecureUtil.getUser().getRoleName());
+						  ls.setUpdateUserName(SecureUtil.getUser().getUserName());
 						  serviceProjectFilesMapper.updateById(ls);
 					  }
 					  //新增
@@ -150,7 +150,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 						  ls.setCreateUser(SecureUtil.getUserId());
 						  String deptId = SecureUtil.getDeptId();
 						  ls.setCreateDept(StringUtils.isNoneBlank(deptId)?Long.valueOf(deptId):-1);
-						  ls.setCreateUserName(SecureUtil.getUser().getRoleName());
+						  ls.setCreateUserName(SecureUtil.getUser().getUserName());
 						  serviceProjectFilesMapper.insert(ls);
 					  }
 				  });
@@ -179,7 +179,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 						  deleteList.forEach(e->{
 							  e.setUpdateUser(SecureUtil.getUserId());
 							  e.setUpdateTime(new Date());
-							  e.setUpdateUserName(SecureUtil.getUser().getRoleName());
+							  e.setUpdateUserName(SecureUtil.getUser().getUserName());
 							  serviceProjectItemMapper.deleteById(e.getId());
 						  });
 					  }
@@ -195,7 +195,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 				originServiceProjectItems.forEach(it->{
 					it.setUpdateUser(SecureUtil.getUserId());
 					it.setUpdateTime(new Date());
-					it.setUpdateUserName(SecureUtil.getUser().getRoleName());
+					it.setUpdateUserName(SecureUtil.getUser().getUserName());
 					serviceProjectItemMapper.deleteById(it.getId());
 				});
 			}
@@ -244,7 +244,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 			serviceProject.setId(serviceProjectItem.getPId());
 			serviceProject.setUpdateUser(SecureUtil.getUserId());
 			serviceProject.setUpdateTime(new Date());
-			serviceProject.setUpdateUserName(SecureUtil.getUser().getRoleName());
+			serviceProject.setUpdateUserName(SecureUtil.getUser().getUserName());
 			serviceProjectMapper.updateById(serviceProject);
 		}
 		//明细已结算之后, 修改主表的已收款项 和 未收款项
@@ -259,7 +259,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 			targetServiceProject.setBalanceAmount(targetServiceProject.getBalanceAmount().subtract(serviceProjectItem.getAmount()));
 			targetServiceProject.setUpdateUser(SecureUtil.getUserId());
 			targetServiceProject.setUpdateTime(new Date());
-			targetServiceProject.setUpdateUserName(SecureUtil.getUser().getRoleName());
+			targetServiceProject.setUpdateUserName(SecureUtil.getUser().getUserName());
 			serviceProjectMapper.updateById(targetServiceProject);
 
 		}
@@ -274,7 +274,7 @@ public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMap
 			targetServiceProject.setBalanceAmount(targetServiceProject.getBalanceAmount().add(serviceProjectItem.getAmount()));
 			targetServiceProject.setUpdateUser(SecureUtil.getUserId());
 			targetServiceProject.setUpdateTime(new Date());
-			targetServiceProject.setUpdateUserName(SecureUtil.getUser().getRoleName());
+			targetServiceProject.setUpdateUserName(SecureUtil.getUser().getUserName());
 			serviceProjectMapper.updateById(targetServiceProject);
 		}
 		//status=6代表撤回, item状态回到4