Przeglądaj źródła

解决修改部门报错

18792927508 2 lat temu
rodzic
commit
e3fe728c6c

+ 1
- 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/CaseApplicationController.java Wyświetl plik

271
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
271
     @Log(title = "组庭审核", businessType = BusinessType.UPDATE)
272
     @PostMapping("/pendTralCheck")
272
     @PostMapping("/pendTralCheck")
273
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
273
     public AjaxResult pendTralCheck(@Validated @RequestBody CaseApplication caseApplication) {
274
-        return toAjax(caseApplicationService.pendTralCheck(caseApplication));
274
+        return caseApplicationService.pendTralCheck(caseApplication);
275
     }
275
     }
276
 
276
 
277
     /**
277
     /**

+ 9
- 7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java Wyświetl plik

315
             Integer deptType = dept.getDeptType();
315
             Integer deptType = dept.getDeptType();
316
             if (deptType != null && deptType.intValue() == 1) {
316
             if (deptType != null && deptType.intValue() == 1) {
317
                 SysPost sysPost = postMapper.selectPostByPostCode("jbr");
317
                 SysPost sysPost = postMapper.selectPostByPostCode("jbr");
318
-                Long postId = sysPost.getPostId();
319
-                if (postIds.length > 0) {
320
-                    boolean isContain = Arrays.asList(postIds).contains(postId);
321
-                    if (isContain) {
322
-                        List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
323
-                        if (sysUsers != null && sysUsers.size() > 0) {
324
-                            return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个!");
318
+                if(sysPost!=null) {
319
+                    Long postId = sysPost.getPostId();
320
+                    if (postIds.length > 0) {
321
+                        boolean isContain = Arrays.asList(postIds).contains(postId);
322
+                        if (isContain) {
323
+                            List<SysUser> sysUsers = userMapper.selectUserByDeptId(deptId);
324
+                            if (sysUsers != null && sysUsers.size() > 0) {
325
+                                return AjaxResult.error("部门类型为仲裁机构的部门的岗位为经办人的用户只能有一个!");
326
+                            }
325
                         }
327
                         }
326
                     }
328
                     }
327
                 }
329
                 }

+ 1
- 1
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/ICaseApplicationService.java Wyświetl plik

39
 
39
 
40
     int pendingAppointArbotrar(CaseApplication caseApplication);
40
     int pendingAppointArbotrar(CaseApplication caseApplication);
41
 
41
 
42
-    int pendTralCheck(CaseApplication caseApplication);
42
+    AjaxResult pendTralCheck(CaseApplication caseApplication);
43
 
43
 
44
     int pendTralSure(CaseApplication caseApplication);
44
     int pendTralSure(CaseApplication caseApplication);
45
 
45
 

+ 3
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseApplicationServiceImpl.java Wyświetl plik

1802
 
1802
 
1803
     @Override
1803
     @Override
1804
     @Transactional
1804
     @Transactional
1805
-    public int pendTralCheck(CaseApplication caseApplication) {
1805
+    public AjaxResult pendTralCheck(CaseApplication caseApplication) {
1806
+        // todo 需要传仲裁员id
1806
         Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
1807
         Integer isAgreePendTral = caseApplication.getIsAgreePendTral();
1807
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
1808
         caseApplication.setCaseStatus(CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL);
1808
         int rows = 0;
1809
         int rows = 0;
1841
         }
1842
         }
1842
         // 新增日志
1843
         // 新增日志
1843
         insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL, "");
1844
         insertCaseLog(caseApplication.getId(), CaseApplicationConstants.CONFIRMDED_PENDING_TRIAL, "");
1844
-        return rows;
1845
+        return success();
1845
     }
1846
     }
1846
 
1847
 
1847
     @Override
1848
     @Override

+ 3
- 7
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseZipImportImpl.java Wyświetl plik

186
             if(future.get()!=null){
186
             if(future.get()!=null){
187
                 return success("导入成功");
187
                 return success("导入成功");
188
             }
188
             }
189
-        } catch (InterruptedException e) {
189
+        } catch (InterruptedException | ExecutionException e) {
190
             e.printStackTrace();
190
             e.printStackTrace();
191
-            return success("导入失败");
192
-        } catch (ExecutionException e) {
193
-
194
-            e.printStackTrace();
195
-            return success("导入失败");
191
+            return error(e.getMessage());
196
         }
192
         }
197
-        return error("导入失败");
193
+    return error("导入失败");
198
 
194
 
199
 
195
 
200
     }
196
     }