Selaa lähdekoodia

1、销售端看课休息配置导致null指针

yys 2 viikkoa sitten
vanhempi
commit
7ce26c3524

+ 12 - 5
fs-company/src/main/java/com/fs/company/controller/course/FsUserCoursePeriodController.java

@@ -119,13 +119,20 @@ public class FsUserCoursePeriodController extends BaseController {
             }
 
             // 看课休息判断
-            if(StringUtils.isNotBlank(vo.getIsOpenRestFlag())){
-                JSONObject  jsonObject= JSON.parseObject(vo.getIsOpenRestFlag());
-                vo.setIsOpenRestReminder(Integer.parseInt(jsonObject.get(currentCompanyId.toString()).toString()));
-            }else {
+            if (StringUtils.isNotBlank(vo.getIsOpenRestFlag())) {
+                try {
+                    JSONObject jsonObject = JSON.parseObject(vo.getIsOpenRestFlag());
+                    // 直接获取对应公司ID的值
+                    Integer restReminder = jsonObject.getInteger(currentCompanyId.toString());
+                    vo.setIsOpenRestReminder(restReminder);
+                } catch (Exception e) {
+                    log.error("解析休息标志失败, isOpenRestFlag: {}, companyId: {}",
+                            vo.getIsOpenRestFlag(), currentCompanyId, e);
+                    vo.setIsOpenRestReminder(null);
+                }
+            } else {
                 vo.setIsOpenRestReminder(null);
             }
-
         }
         PageInfo<FsUserCoursePeriodVO> pageInfo = new PageInfo<>(list);
         Map<String, Object> result = new HashMap<>();