提交时少了项目类型

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -467,7 +467,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
         }
         //申请修改之后再次提交，先清除上一次提交后的审核记录
         PmAuditDeptRef ref = new PmAuditDeptRef();
-        ref.setRefId(byId.getPlanYearId()).setRefType("0");
+        ref.setRefId(byId.getPlanYearId()).setRefType("0").setProjectType(byId.getProjectType()).setEvaluation(byId.getEvaluation());
         PlanQuarterServiceImpl.refIsExist(ref, pmAuditDeptRefMapper);
         PlanQuarterServiceImpl.insertAuditDeptRef(userService, pmAuditDeptRefService, ref);
 

purchase-system/src/main/java/com/ozs/system/service/impl/SysDeptOrganServiceImpl.java

@@ -57,9 +57,17 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
             wrapperT.eq(SysDeptOrgan::getDeptId, sysDept.getParentId());
             organsT = deptOrganMapper.selectList(wrapperT);
             SysDept sysDeptTwo = sysDeptMapper.selectDeptById(sysDept.getParentId());
-            hashMap.put(sysDeptTwo.getDeptName(), organsT);
+            if (ObjectUtils.isEmpty(organsT)) {
+                hashMap.put(sysDeptTwo.getDeptName() + "(暂无数据)", organsT);
+            } else {
+                hashMap.put(sysDeptTwo.getDeptName(), organsT);
+            }
+        }
+        if (ObjectUtils.isEmpty(sysDept)) {
+            hashMap.put(sysDept.getDeptName() + "(暂无数据)", organs);
+        } else {
+            hashMap.put(sysDept.getDeptName(), organs);
         }
-        hashMap.put(sysDept.getDeptName(), organs);
         return AjaxResult.success(hashMap);
     }