diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java index 45b4352..37edd83 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java @@ -271,7 +271,7 @@ public class CaseApplicationController extends BaseController { @Log(title = "组庭审核", businessType = BusinessType.UPDATE) @PostMapping("/pendTralCheck") public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) { - return toAjax(caseApplicationService.pendTralCheck(caseApplication)); + return caseApplicationService.pendTralCheck(caseApplication); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index dcc8cdf..2f93110 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -315,13 +315,15 @@ public class SysUserServiceImpl implements ISysUserService { Integer deptType = dept.getDeptType(); if (deptType != null && deptType.intValue() == 1) { SysPost sysPost = postMapper.selectPostByPostCode("jbr"); - Long postId = sysPost.getPostId(); - if (postIds.length > 0) { - boolean isContain = Arrays.asList(postIds).contains(postId); - if (isContain) { - List sysUsers = userMapper.selectUserByDeptId(deptId); - if (sysUsers != null && sysUsers.size() > 0) { - return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个!"); + if(sysPost!=null) { + Long postId = sysPost.getPostId(); + if (postIds.length > 0) { + boolean isContain = Arrays.asList(postIds).contains(postId); + if (isContain) { + List sysUsers = userMapper.selectUserByDeptId(deptId); + if (sysUsers != null && sysUsers.size() > 0) { + return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个!"); + } } } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java index 7c399a0..d35dac9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java @@ -39,7 +39,7 @@ public interface ICaseApplicationService { int pendingAppointArbotrar(CaseApplication caseApplication); - int pendTralCheck(CaseApplication caseApplication); + AjaxResult pendTralCheck(CaseApplication caseApplication); int pendTralSure(CaseApplication caseApplication); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java index 62bc728..c9cb2bc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java @@ -1802,7 +1802,8 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { @Override @Transactional - public int pendTralCheck(CaseApplication caseApplication) { + public AjaxResult pendTralCheck(CaseApplication caseApplication) { + // todo 需要传仲裁员id Integer isAgreePendTral = caseApplication.getIsAgreePendTral(); caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL); int rows = 0; @@ -1841,7 +1842,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService { } // 新增日志 insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL, ""); - return rows; + return success(); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java index b67e8c4..1295540 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java @@ -186,15 +186,11 @@ public class CaseZipImportImpl { if(future.get()!=null){ return success("导入成功"); } - } catch (InterruptedException e) { + } catch (InterruptedException | ExecutionException e) { e.printStackTrace(); - return success("导入失败"); - } catch (ExecutionException e) { - - e.printStackTrace(); - return success("导入失败"); + return error(e.getMessage()); } - return error("导入失败"); + return error("导入失败"); }