Browse Source

去掉临时清除缓存代码,改成前端处理。

seyason 2 years ago
parent
commit
a3cc316aaf

+ 0 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/AuthRedirectController.java

@@ -54,8 +54,6 @@ public class AuthRedirectController {
     @Resource
     UserMapper userMapper;
 
-    public static final long version = System.currentTimeMillis();
-
     @RequestMapping("/corpWXAuth")
     public ModelAndView auth(String code, int state) {
         Map<String,Object> reqParam = new HashMap<String,Object>(16);
@@ -79,8 +77,6 @@ public class AuthRedirectController {
             reqParam.put("userId", curUser.getId());
         }
         reqParam.put("hasTriedAutoLogin", 1);
-        //加上时间戳,保证每次服务器升级后是最新的
-        reqParam.put("v", version);
         String redirecUrl = null;
         if (state == 0) {
             redirecUrl = "http://mobworktime.ttkuaiban.com";

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -728,7 +728,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             fTask.setTaskStatus(1);
             LocalDate createDate = reportList.get(0).getCreateDate();
             fTask.setFinishDate(createDate);
-            taskMapper.update(fTask, new QueryWrapper<Task>().in("id", finishedTaskIds));
+            //不能用Mapper更新,使用mapper更新会导致下面的taskService获取数据不是最新的,没有finshDate
+            taskService.update(fTask, new QueryWrapper<Task>().in("id", finishedTaskIds));
             taskService.notifyMileStoneFinish(companyId, finishedTaskIds);
         }