fix metadata bug
This commit is contained in:
		
							parent
							
								
									3eff075762
								
							
						
					
					
						commit
						27f313e939
					
				
							
								
								
									
										8
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -7,6 +7,9 @@
 | 
				
			|||||||
# Editor-based HTTP Client requests
 | 
					# Editor-based HTTP Client requests
 | 
				
			||||||
/httpRequests/
 | 
					/httpRequests/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/.settings/
 | 
				
			||||||
 | 
					/.vscode/
 | 
				
			||||||
### Example user template template
 | 
					### Example user template template
 | 
				
			||||||
### Example user template
 | 
					### Example user template
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -38,7 +41,10 @@ gen
 | 
				
			|||||||
*.zip
 | 
					*.zip
 | 
				
			||||||
*.tar.gz
 | 
					*.tar.gz
 | 
				
			||||||
*.rar
 | 
					*.rar
 | 
				
			||||||
 | 
					.factorypath
 | 
				
			||||||
 | 
					.project
 | 
				
			||||||
 | 
					/target/**
 | 
				
			||||||
 | 
					.classpath
 | 
				
			||||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 | 
					# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 | 
				
			||||||
hs_err_pid*
 | 
					hs_err_pid*
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								pom.xml
									
									
									
									
									
								
							@ -15,7 +15,7 @@
 | 
				
			|||||||
    <description>Demo project for Spring Boot</description>
 | 
					    <description>Demo project for Spring Boot</description>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <properties>
 | 
					    <properties>
 | 
				
			||||||
        <java.version>1.8</java.version>
 | 
					        <java.version>11</java.version>
 | 
				
			||||||
        <skipTest>true</skipTest>
 | 
					        <skipTest>true</skipTest>
 | 
				
			||||||
    </properties>
 | 
					    </properties>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -53,7 +53,7 @@ public class ProjectServiceImpl implements ProjectService {
 | 
				
			|||||||
        MetaData metaData = metaDataDao.selectMetaData(createProjectDTO.getMetaDataName());
 | 
					        MetaData metaData = metaDataDao.selectMetaData(createProjectDTO.getMetaDataName());
 | 
				
			||||||
        Project project = new Project();
 | 
					        Project project = new Project();
 | 
				
			||||||
        project.setName(createProjectDTO.getName());
 | 
					        project.setName(createProjectDTO.getName());
 | 
				
			||||||
        project.setMetaData(metaData);
 | 
					        // project.setMetaData(metaData);
 | 
				
			||||||
        project.setStartTime(createProjectDTO.getStartTime());
 | 
					        project.setStartTime(createProjectDTO.getStartTime());
 | 
				
			||||||
        project.setEndTime(createProjectDTO.getEndTime());
 | 
					        project.setEndTime(createProjectDTO.getEndTime());
 | 
				
			||||||
        project.setDetail(createProjectDTO.getDetail());
 | 
					        project.setDetail(createProjectDTO.getDetail());
 | 
				
			||||||
@ -72,9 +72,9 @@ public class ProjectServiceImpl implements ProjectService {
 | 
				
			|||||||
                    projectVO.setStartTime(project.getStartTime());
 | 
					                    projectVO.setStartTime(project.getStartTime());
 | 
				
			||||||
                    projectVO.setEndTime(project.getEndTime());
 | 
					                    projectVO.setEndTime(project.getEndTime());
 | 
				
			||||||
                    projectVO.setUsername(project.getUser().getUsername());
 | 
					                    projectVO.setUsername(project.getUser().getUsername());
 | 
				
			||||||
                    if (project.getMetaData() != null) {
 | 
					                    // if (project.getMetaData() != null) {
 | 
				
			||||||
                        projectVO.setMetaDataName(project.getMetaData().getName());
 | 
					                    //     projectVO.setMetaDataName(project.getMetaData().getName());
 | 
				
			||||||
                    }
 | 
					                    // }
 | 
				
			||||||
                    projectVO.setState(project.getState());
 | 
					                    projectVO.setState(project.getState());
 | 
				
			||||||
                    return projectVO;
 | 
					                    return projectVO;
 | 
				
			||||||
                }).collect(Collectors.toList());
 | 
					                }).collect(Collectors.toList());
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user