java71- 张威豹 3 rokov pred
rodič
commit
6f78d43284

+ 2 - 7
ruoyi-ahrs/src/main/java/com/ruoyi/ahrs/recruitplan/controller/RecruitPlanMainController.java

@@ -172,11 +172,6 @@ public class RecruitPlanMainController extends BaseController
         }
     }
 
-    private RecruitPlanChild splicingMajor(RecruitPlanChild recruitPlanChildToMajor){
-     recruitPlanChildToMajor = recruitPlanMainService.splicingMajor(recruitPlanChildToMajor);
-     return  recruitPlanChildToMajor;
-    }
-
     /**
      * 修改recruitplanMain
      */
@@ -321,7 +316,7 @@ public class RecruitPlanMainController extends BaseController
         return toAjax(true);
     }
 
-    //岗位代码修改时发出提醒
+/*    //岗位代码修改时发出提醒
     @GetMapping("/verifyRecruitPlanChild/{recruitPlanChildId}")
     @ResponseBody
     public AjaxResult verifyPersonnel(@PathVariable("recruitPlanChildId") Long recruitPlanChildId){
@@ -337,6 +332,6 @@ public class RecruitPlanMainController extends BaseController
         }catch (Exception e){
             return toAjax(false);
         }
-    }
+    }*/
 
 }

+ 2 - 0
ruoyi-ahrs/src/main/java/com/ruoyi/ahrs/recruitplan/service/impl/RecruitPlanMainServiceImpl.java

@@ -74,6 +74,8 @@ public class RecruitPlanMainServiceImpl implements IRecruitPlanMainService {
             }
         }
         recruitPM.setRecruitPlanYear(recruitPlanMain.getRecruitPlanYear());
+        recruitPM.setVersion(recruitPlanMain.getVersion());
+        recruitPM.setDeptId(recruitPlanMain.getDeptId());
         recruitPM.setRecruitPlanMainId(recruitPlanMainId);
         recruitPM.setDeptName(recruitPlanMain.getDeptName());
         recruitPM.setColumns(recruitPlanMain.getAhrsRecruitPlanChildList());