Merge remote-tracking branch 'origin/develop' into develop

authority-admin/src/main/java/com/ruoyi/web/controller/authority/ProjectAuthorityController.java

@@ -43,13 +43,12 @@ public class ProjectAuthorityController {
         Date date = dateFormat.parse(sysSecretProject.getOverdueDate().toString());
         long seconds = (date.getTime() - now.getTime()) / 1000;
         if (seconds > 0) {
-            map.put("overdueDate", seconds);
             map.put("isOverdue", true);
-            map.put("isSwitch", sysSecretProject.getIsSwitch());
         } else {
             map.put("isOverdue", false);
-            map.put("isSwitch", sysSecretProject.getIsSwitch());
         }
+        map.put("overdueDate", seconds);
+        map.put("isSwitch", sysSecretProject.getIsSwitch());
         return R.ok(map);
     }