diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java index 0cada0c..7ba798e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/DeptIdentifyController.java @@ -138,7 +138,7 @@ public class DeptIdentifyController extends BaseController { * @return */ @PostMapping("/updateTemplate") - public AjaxResult updateTemplate(@RequestBody TemplateManage templateManage,@RequestParam("file") MultipartFile file){ + public AjaxResult updateTemplate(TemplateManage templateManage,@RequestParam("file") MultipartFile file){ return deptIdentifyService.updateTemplate(templateManage,file); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java index 5aea082..0fa8152 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/TemplateManage.java @@ -42,4 +42,8 @@ public class TemplateManage extends BaseEntity { * 删除标志(0代表存在 2代表删除) */ private Integer delFlag; + /** + * 机构关联id + */ + private String identifyName; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java index 0a93c03..a65eb22 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/DeptIdentifyServiceImpl.java @@ -412,16 +412,18 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService { return AjaxResult.error(); } try { - String filePath = RuoYiConfig.getUploadPath(); - // 上传 - String fileName = FileUploadUtils.upload(filePath, file); - String prefix = "/profile"; - int startIndex = fileName.indexOf(prefix); - startIndex += prefix.length(); - String annexPath = "home/ruoyi/uploadPath" + fileName.substring(startIndex); - templateManage.setTemOrigPath(annexPath); - String format = getFileExtension(fileName); - templateManage.setTemFormat(format); + if (file != null && file.getSize() > 0) { + String filePath = RuoYiConfig.getUploadPath(); + // 上传 + String fileName = FileUploadUtils.upload(filePath, file); + String prefix = "/profile"; + int startIndex = fileName.indexOf(prefix); + startIndex += prefix.length(); + String annexPath = "home/ruoyi/uploadPath" + fileName.substring(startIndex); + templateManage.setTemOrigPath(annexPath); + String format = getFileExtension(fileName); + templateManage.setTemFormat(format); + } templateManage.setUpdateBy(getUsername()); int i = templateManageMapper.updateTemplateManage(templateManage); if (i > 0) { @@ -450,6 +452,19 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService { TemplateManage templateManage = new TemplateManage(); templateManage.setIdentifyId(deptIdentify.getId()); List templateManages = templateManageMapper.selectTemplateList(templateManage); + if (templateManages != null && templateManages.size() > 0) { + for (TemplateManage manage : templateManages) { + //根据机构id查询机构名称 + Long identifyId = manage.getIdentifyId(); + if (identifyId != null) { + deptIdentify.setId(identifyId); + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + if (deptIdentifies != null && deptIdentifies.size() > 0) { + manage.setIdentifyName(deptIdentifies.get(0).getIdentifyName()); + } + } + } + } return templateManages; }