修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -676,7 +676,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
             planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
         }
-        Toke toke = remoteSecurityService.getServerToken();
+//        Toke toke = remoteSecurityService.getServerToken();
         Map<String, String> deptMap = new HashMap<>();
         Map<String, Object> nameMap = new HashMap<>();
         try {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/config/PersonIdentifyAspect.java

@@ -48,12 +48,18 @@ public class PersonIdentifyAspect {
 
     @Before("userDate()")
     public void personIdentity(JoinPoint joinPoint) throws PermissionException {
+
+
+        //定时任务没有token
+        if(RequestContext.getExeUserId()==null|| RequestContext.getToken()==null){
+
+        }else {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (reginParam != null ) {
-           if(reginParam.getPersonIdentity()==null || reginParam.getPersonIdentity().getCompanyBizOrgCode()==null){
+            if (reginParam.getPersonIdentity() == null || reginParam.getPersonIdentity().getCompanyBizOrgCode() == null) {
                 String userId = reginParam.getUserModel().getUserId();
 
-                if(userId!=null){
+                if (userId != null) {
                     FeignClientResult responseModel = jcsFeignClient.selectById(userId);
 
 
@@ -62,13 +68,13 @@ public class PersonIdentifyAspect {
                     }
                     String s = JSONObject.toJSONString(responseModel.getResult());
                     ReginParams.PersonIdentity personIdentity = JSONObject.parseObject(s, ReginParams.PersonIdentity.class);
-                //    ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
+                    //    ReginParams.PersonIdentity personIdentity = (ReginParams.PersonIdentity) Bean.mapToBean((Map<String, Object>) responseModel.getResult(), ReginParams.PersonIdentity.class);
                     reginParam.setPersonIdentity(personIdentity);
                     redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParam));
 
                 }
-                }
-
+            }
+         }
         }
     }