1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanServiceImpl.java

@@ -191,7 +191,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
         //获取计划进度
         List<Map<String, Object>> planRealTimeProgressList=new ArrayList<>();
-        if(isMob==1){
+        if(isMob!=null&&isMob==1){
             planRealTimeProgressList= reportMapper.getPlanRealTimeProgressList(companyId, null, null, null, null, null, null, null, planIds);
         }
         List<Map<String, Object>> finalPlanRealTimeProgressList = planRealTimeProgressList;
@@ -238,7 +238,7 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                 bigDecimal=bigDecimal.multiply(new BigDecimal(String.valueOf(rs.getPlanWorkHour())));
                 rs.setTotalMoney(bigDecimal.doubleValue());
             }
-            if(isMob==1){
+            if(isMob!=null&&isMob==1){
                 Optional<Map<String, Object>> first1 = finalPlanRealTimeProgressList.stream().filter(pt -> pt.get("planId").equals(rs.getId())).findFirst();
                 if(first1.isPresent()){
                     BigDecimal planWorkTime = new BigDecimal(first1.get().get("planWorkTime") == null ? 0 : Double.valueOf(String.valueOf(first1.get().get("planWorkTime"))));