Commit c911a42112fcad0da87b62884d158c71889762da
1 parent
5e9480fa
feat: 修改人事人员获取逻辑
Showing
2 changed files
with
2 additions
and
3 deletions
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
| @@ -451,7 +451,7 @@ public class DriverJob implements InitializingBean { | @@ -451,7 +451,7 @@ public class DriverJob implements InitializingBean { | ||
| 451 | driver.setPosts(formData.getTextField_lk9mk226()); | 451 | driver.setPosts(formData.getTextField_lk9mk226()); |
| 452 | // 解析JSON字符串 | 452 | // 解析JSON字符串 |
| 453 | List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class); | 453 | List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class); |
| 454 | - driver.setImage(lists.get(0).getPreviewUrl()); | 454 | + driver.setImage(CollectionUtil.isNotEmpty(lists) ? lists.get(0).getPreviewUrl() : ""); |
| 455 | driver.setLineName(formData.getTextField_lkmgdvnu()); | 455 | driver.setLineName(formData.getTextField_lkmgdvnu()); |
| 456 | driver.setFleetName(formData.getTextField_lkmgdvnv()); | 456 | driver.setFleetName(formData.getTextField_lkmgdvnv()); |
| 457 | return driver; | 457 | return driver; |
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
| @@ -282,11 +282,10 @@ public class ThreadJobService { | @@ -282,11 +282,10 @@ public class ThreadJobService { | ||
| 282 | // 获取图片请求地址 | 282 | // 获取图片请求地址 |
| 283 | if (StringUtils.isEmpty(imageUrl)) { | 283 | if (StringUtils.isEmpty(imageUrl)) { |
| 284 | log.error("工号:{},图片缺失,放弃保存员工信息,等待员工图片手动上传。", driver.getJobCode()); | 284 | log.error("工号:{},图片缺失,放弃保存员工信息,等待员工图片手动上传。", driver.getJobCode()); |
| 285 | - return; | ||
| 286 | } | 285 | } |
| 287 | int result = driverMapper.insertDriver(driver); | 286 | int result = driverMapper.insertDriver(driver); |
| 288 | log.debug("插入完毕"); | 287 | log.debug("插入完毕"); |
| 289 | - if (result != 0) { | 288 | + if (result != 0 && StringUtils.isNotEmpty(imageUrl)) { |
| 290 | log.info("图片开始上传"); | 289 | log.info("图片开始上传"); |
| 291 | // 获取图片数据 | 290 | // 获取图片数据 |
| 292 | InputStream is = getImageInputStreamByUrl(imageUrl); | 291 | InputStream is = getImageInputStreamByUrl(imageUrl); |