Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -388,30 +388,47 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             PerformDetailInfo performDetailInfo = new PerformDetailInfo();
             if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
                 CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(performReq.getPerformType())) {
                 CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.办件绩效.getValue().equals(performReq.getPerformType())) {
                 CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.效能绩效.getValue().equals(performReq.getPerformType())) {
                 CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.其它绩效.getValue().equals(performReq.getPerformType())) {
                 CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else {
                 throw new AppException("不支持当前绩效类型");
             }
 
             PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()).performType(performReq.getPerformType()));
-            log.info("entity:{}", JSONObject.toJSONString(entity));
-
             if (!ObjectUtils.isEmpty(entity)) {
+                log.info("entity:{}", JSONObject.toJSONString(entity));
                 Boolean bool = entity.newEntity();
                 if (bool) {
                     performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());