1.修复非评估部人员查询评估部绩效申报报错

service/src/main/java/com/dayou/service/impl/CommissionDeclareServiceImpl.java

@@ -1,6 +1,7 @@
 package com.dayou.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -121,7 +122,11 @@ public class CommissionDeclareServiceImpl extends ServiceImpl<CommissionDeclareM
                 .filter(obj -> "评估一部".equals(obj.getName()) || "评估二部".equals(obj.getName()) || "评估三部".equals(obj.getName()))
                 .map(SimpleParentModel::getId)
                 .findFirst();
-        return commissionDeclareMapper.majorEvaluateDeclarePageByDepartment(page, commissionDeclare, dep.get());
+        if (!dep.isPresent()) {
+            return commissionDeclareMapper.majorEvaluateDeclarePageByDepartment(page, commissionDeclare, depList.get(0).getId());
+        }else {
+            return commissionDeclareMapper.majorEvaluateDeclarePageByDepartment(page, commissionDeclare, dep.get());
+        }
     }
 
     /**