LIVE_YE 2 yıl önce
ebeveyn
işleme
101e9e7f16

+ 1 - 1
ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>OA_kaoqing</artifactId>
 
     <description>
         web服务入口

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/kaoqin/CardReplacementRecordController.java

@@ -106,8 +106,8 @@ public class CardReplacementRecordController extends BaseController
      * @param isPass 是否通过 1:不通过,2:通过'
      * @return
      */
-    @GetMapping(value = "/putPass")
-    public AjaxResult putPass(CardReplacementRecord cardReplacementRecord)
+    @PostMapping(value = "/putPass")
+    public AjaxResult putPass(@RequestBody CardReplacementRecord cardReplacementRecord)
     {
         return toAjax(cardReplacementRecordService.putPass(cardReplacementRecord));
     }

+ 15 - 7
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -211,14 +211,22 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public int insertDept(SysDept dept)
     {
-        SysDept info = deptMapper.selectDeptById(dept.getParentId());
-        // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
-            throw new ServiceException("部门停用,不允许新增");
+
+        if(dept.getParentId()==0L){
+            dept.setAncestors( "0," + dept.getParentId());
+            return deptMapper.insertDept(dept);
+        }else{
+            SysDept info = deptMapper.selectDeptById(dept.getParentId());
+            // 如果父节点不为正常状态,则不允许新增子节点
+
+            if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+            {
+                throw new ServiceException("部门停用,不允许新增");
+            }
+            dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+            return deptMapper.insertDept(dept);
         }
-        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-        return deptMapper.insertDept(dept);
+
     }
 
     /**