youxiw2000 / trash · Commits

Commit b7725274dc171879c579c0bf47282b22db015358

Authored by 273548560@qq.com
1 parent f0ee50d4
build: skipped

修复bug

Inline Side-by-side
Showing 5 changed files with 35 additions and 25 deletions
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @b772527
@@ -54,11 +54,13 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService @@ -54,11 +54,13 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
54 { 54 {
55 ViolationCaseFileVo violationCaseFileVo = new ViolationCaseFileVo(); 55 ViolationCaseFileVo violationCaseFileVo = new ViolationCaseFileVo();
56 violationCaseFileVo.setViolationCaseFile(violationCaseFileMapper.selectViolationCaseFileById(id)); 56 violationCaseFileVo.setViolationCaseFile(violationCaseFileMapper.selectViolationCaseFileById(id));
57 - UploadFile uploadFile = new UploadFile();  
58 - uploadFile.setTableName("violation_case_file");  
59 - uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());  
60 - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);  
61 - violationCaseFileVo.setUploadFiles(list); 57 + if(violationCaseFileVo.getViolationCaseFile()!=null){
  58 + UploadFile uploadFile = new UploadFile();
  59 + uploadFile.setTableName("violation_case_file");
  60 + uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
  61 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  62 + violationCaseFileVo.setUploadFiles(list);
  63 + }
62 return violationCaseFileVo; 64 return violationCaseFileVo;
63 } 65 }
64 66
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
  View file @b772527
@@ -54,11 +54,13 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning @@ -54,11 +54,13 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
54 public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) { 54 public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) {
55 ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo(); 55 ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo();
56 violationWarningInformationVo.setViolationWarningInformation(violationWarningInformationMapper.selectViolationWarningInformationById(id)); 56 violationWarningInformationVo.setViolationWarningInformation(violationWarningInformationMapper.selectViolationWarningInformationById(id));
57 - UploadFile uploadFile = new UploadFile();  
58 - uploadFile.setTableName("violation_warning_information");  
59 - uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());  
60 - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);  
61 - violationWarningInformationVo.setUploadFiles(list); 57 + if(violationWarningInformationVo.getViolationWarningInformation()!=null){
  58 + UploadFile uploadFile = new UploadFile();
  59 + uploadFile.setTableName("violation_warning_information");
  60 + uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
  61 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  62 + violationWarningInformationVo.setUploadFiles(list);
  63 + }
62 return violationWarningInformationVo; 64 return violationWarningInformationVo;
63 } 65 }
64 66
trash-workFlow/src/main/java/com/trash/office/service/impl/ConferenceServiceImpl.java
  View file @b772527
@@ -70,11 +70,13 @@ public class ConferenceServiceImpl implements IConferenceService { @@ -70,11 +70,13 @@ public class ConferenceServiceImpl implements IConferenceService {
70 public ConferenceVo selectConferenceById(Long id) { 70 public ConferenceVo selectConferenceById(Long id) {
71 ConferenceVo ConferenceVo = new ConferenceVo(); 71 ConferenceVo ConferenceVo = new ConferenceVo();
72 ConferenceVo.setConference(conferenceMapper.selectConferenceById(id)); 72 ConferenceVo.setConference(conferenceMapper.selectConferenceById(id));
73 - UploadFile uploadFile = new UploadFile();  
74 - uploadFile.setTableName("conference");  
75 - uploadFile.setTableNumber(ConferenceVo.getConference().getId().toString());  
76 - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);  
77 - ConferenceVo.setUploadFiles(list); 73 + if(ConferenceVo.getConference()!=null){
  74 + UploadFile uploadFile = new UploadFile();
  75 + uploadFile.setTableName("conference");
  76 + uploadFile.setTableNumber(ConferenceVo.getConference().getId().toString());
  77 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  78 + ConferenceVo.setUploadFiles(list);
  79 + }
78 return ConferenceVo; 80 return ConferenceVo;
79 } 81 }
80 82
trash-workFlow/src/main/java/com/trash/office/service/impl/ContractManagementServiceImpl.java
  View file @b772527
@@ -50,11 +50,13 @@ public class ContractManagementServiceImpl implements IContractManagementService @@ -50,11 +50,13 @@ public class ContractManagementServiceImpl implements IContractManagementService
50 public ContractManagementVo selectContractManagementById(Long id) { 50 public ContractManagementVo selectContractManagementById(Long id) {
51 ContractManagementVo contractManagementVo = new ContractManagementVo(); 51 ContractManagementVo contractManagementVo = new ContractManagementVo();
52 contractManagementVo.setContractManagement(contractManagementMapper.selectContractManagementById(id)); 52 contractManagementVo.setContractManagement(contractManagementMapper.selectContractManagementById(id));
53 - UploadFile uploadFile = new UploadFile();  
54 - uploadFile.setTableName("contract_management");  
55 - uploadFile.setTableNumber(contractManagementVo.getContractManagement().getContractNumber());  
56 - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);  
57 - contractManagementVo.setUploadFiles(list); 53 + if(contractManagementVo.getContractManagement()!=null){
  54 + UploadFile uploadFile = new UploadFile();
  55 + uploadFile.setTableName("contract_management");
  56 + uploadFile.setTableNumber(contractManagementVo.getContractManagement().getContractNumber());
  57 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  58 + contractManagementVo.setUploadFiles(list);
  59 + }
58 return contractManagementVo; 60 return contractManagementVo;
59 } 61 }
60 62
trash-workFlow/src/main/java/com/trash/office/service/impl/LeaveApplicationServiceImpl.java
  View file @b772527
@@ -61,11 +61,13 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService @@ -61,11 +61,13 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
61 { 61 {
62 LeaveApplicationVo leaveApplicationVo = new LeaveApplicationVo(); 62 LeaveApplicationVo leaveApplicationVo = new LeaveApplicationVo();
63 leaveApplicationVo.setLeaveApplication(leaveApplicationMapper.selectLeaveApplicationById(id)); 63 leaveApplicationVo.setLeaveApplication(leaveApplicationMapper.selectLeaveApplicationById(id));
64 - UploadFile uploadFile = new UploadFile();  
65 - uploadFile.setTableName("leave_application");  
66 - uploadFile.setTableNumber(leaveApplicationVo.getLeaveApplication().getId().toString());  
67 - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);  
68 - leaveApplicationVo.setUploadFiles(list); 64 + if(leaveApplicationVo.getLeaveApplication()!=null){
  65 + UploadFile uploadFile = new UploadFile();
  66 + uploadFile.setTableName("leave_application");
  67 + uploadFile.setTableNumber(leaveApplicationVo.getLeaveApplication().getId().toString());
  68 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  69 + leaveApplicationVo.setUploadFiles(list);
  70 + }
69 return leaveApplicationVo; 71 return leaveApplicationVo;
70 } 72 }
71 73