chenr 1 сар өмнө
parent
commit
c7c5cf39a6

+ 5 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeContractController.java

@@ -107,6 +107,9 @@ public class ArchiveTreeContractController extends BladeController {
         if(detail.getReviewer()==null&&info!=null&&info.getReviewer()!=null){
             detail.setReviewer(info.getReviewer());
         }
+        if(detail.getFileNumberPrefix()==null&&info!=null&&info.getPrefix()!=null){
+            detail.setFileNumberPrefix(info.getPrefix());
+        }
         return R.data(detail);
     }
 
@@ -157,7 +160,7 @@ public class ArchiveTreeContractController extends BladeController {
     /**
      * isSaveChild 0是保存子节点,1不保存子节点
      */
-    public R update(@Valid @RequestBody ArchiveTreeContract archiveTreeContract,Integer isSaveChild) {
+    public R update(@Valid @RequestBody ArchiveTreeContractDTO archiveTreeContract) {
         if (archiveTreeContract == null) {
             return R.fail(200, "未查询到对应节点信息");
         }
@@ -222,7 +225,7 @@ public class ArchiveTreeContractController extends BladeController {
 
         boolean b = archiveTreeContractService.updateById(ar);
         //更新下级节点为同一规则
-        if(isSaveChild==0){
+        if(archiveTreeContract.getIsSaveChild()!=null&&archiveTreeContract.getIsSaveChild()==0){
             archiveTreeContractService.updateAllSonNodeIdsForArchiveAutoRule(ar);
         }
         return R.status(b);