小程序分页查询维保记录列表判断是否传参项目id;上传图片url前缀改为https
This commit is contained in:
		
							parent
							
								
									243e2304b2
								
							
						
					
					
						commit
						c4a6cfdc97
					
				| @ -134,8 +134,9 @@ public class WxLoginController extends BaseController { | |||||||
|             // 上传并返回新文件名称 |             // 上传并返回新文件名称 | ||||||
|             String fileName = FileUploadUtils.upload(filePath, file); |             String fileName = FileUploadUtils.upload(filePath, file); | ||||||
|             String url = serverConfig.getUrl() + "/prod-api"+ fileName; |             String url = serverConfig.getUrl() + "/prod-api"+ fileName; | ||||||
|  |             String newUrl = url.replace("http", "https"); | ||||||
|             AjaxResult ajax = success(); |             AjaxResult ajax = success(); | ||||||
|             ajax.put("url", url); |             ajax.put("url", newUrl); | ||||||
|             ajax.put("fileName", fileName); |             ajax.put("fileName", fileName); | ||||||
|             ajax.put("newFileName", FileUtils.getName(fileName)); |             ajax.put("newFileName", FileUtils.getName(fileName)); | ||||||
|             ajax.put("originalFilename", file.getOriginalFilename()); |             ajax.put("originalFilename", file.getOriginalFilename()); | ||||||
| @ -194,6 +195,9 @@ public class WxLoginController extends BaseController { | |||||||
|     @GetMapping("/informationList") |     @GetMapping("/informationList") | ||||||
|     public TableDataInfo list(WbMaintenanceInformation wbMaintenanceInformation) |     public TableDataInfo list(WbMaintenanceInformation wbMaintenanceInformation) | ||||||
|     { |     { | ||||||
|  |         if(StringUtils.isEmpty(wbMaintenanceInformation.getProjectId())){ | ||||||
|  |             return getDataTable(new ArrayList<>()); | ||||||
|  |         } | ||||||
|         startPage(); |         startPage(); | ||||||
|         List<WbMaintenanceInformation> list = wbMaintenanceInformationService.selectWbMaintenanceInformationList(wbMaintenanceInformation); |         List<WbMaintenanceInformation> list = wbMaintenanceInformationService.selectWbMaintenanceInformationList(wbMaintenanceInformation); | ||||||
|         return getDataTable(list); |         return getDataTable(list); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user