修改导出动态列

attendance-performance-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -98,6 +98,13 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                     UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
                     userEntity.setToken(token);
                     return userEntity;
+                }else{
+                     userStr = cacheService.get(userKey);
+                    if (StringUtils.isNotEmpty(userStr)) {
+                        UserEntity userEntity = JSONObject.parseObject(userStr, UserEntity.class);
+                        userEntity.setToken(token);
+                        return userEntity;
+                    }
                 }
             } catch (Exception e) {
                 log.error("解析jwt token异常！", e);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendRecordServiceImpl.java

@@ -91,7 +91,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
         entity.setErrorResult(entity.getRuleName());
         entity.setDeductTime(new Date());
-        if(ObjectUtils.isEmpty(entity.getDeductPerson())){
+        if (ObjectUtils.isEmpty(entity.getDeductPerson())) {
             entity.setDeductPerson(context == null ? "" : context.getUser() == null ? "" : context.getUser().getRealName());
         }
         if (!ObjectUtils.isEmpty(entity.getAttendanceGroupId())) {
@@ -138,8 +138,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
                                 entity.setGoOffTimeStr("");
                         }
                     }
-                }
-                else if (TypeEnum.自由工时.getValue() == attendanceGroupEntity.getType()) {
+                } else if (TypeEnum.自由工时.getValue() == attendanceGroupEntity.getType()) {
 
                 } else if (TypeEnum.排班制.getValue() == attendanceGroupEntity.getType()) {
 
@@ -163,10 +162,10 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
                 String goWorkStr = "";
                 String offWorkStr = "";
                 if (!ObjectUtils.isEmpty(classDetailEntity.getGoWorkDate())) {
-                    goWorkStr = DateUtil.format(classDetailEntity.getGoWorkDate(),"HH:mm");
+                    goWorkStr = DateUtil.format(classDetailEntity.getGoWorkDate(), "HH:mm");
                 }
                 if (!ObjectUtils.isEmpty(classDetailEntity.getOffWorkDate())) {
-                    offWorkStr = DateUtil.format(classDetailEntity.getOffWorkDate(),"HH:mm");
+                    offWorkStr = DateUtil.format(classDetailEntity.getOffWorkDate(), "HH:mm");
                 }
                 goOffWorkSb.append(goWorkStr);
                 goOffWorkSb.append("~");
@@ -212,8 +211,8 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         //考勤保存
         //通过手机号码查询员工属性
         PerformRulesEntity rule = getRule(req.getRuleCode());
+        if (ObjectUtils.isEmpty(req.getStaffId())) return;
         StaffEntity staffEntity = staffService.getCache(req.getStaffId().toString());
-
         PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
         recordEntity.initAttrValue();
         recordEntity.setSubMethod(SubMethodEnum.系统自动.getValue());
@@ -236,7 +235,7 @@ public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<Perf
         recordEntity.setWorkNum(staffEntity.getWorkNum());
         PerformRulesCategoryEntity categoryEntity = categoryService.get(rule.getCategoryId());
         recordEntity.setCategoryName(categoryEntity == null ? "" : categoryEntity.getName());
-         this.save(recordEntity);
+        this.save(recordEntity);
     }
 
     private PerformRulesEntity getRule(String ruleCode) {