|
|
@@ -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<>();
|