修改新增部门没有上级接口空指针

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门信息
- * 
+ *
  * @author ruoyi
  */
 @RestController

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

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

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -254,7 +254,7 @@ public class BmProjectServiceImpl implements IBmProjectService {
                 return AjaxResult.error("当前项目已结束,无法继续操作");
             }
             //判断是否是提交审核/通过审核
-            projectStatus = (code & 1) == 0 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+            projectStatus = (code & 1) == 1 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
             if (projectStatus < EXAMINE_COMMIT) {
                 projectStatus = EXAMINE_COMMIT;
             }