bug修改，微会议密码encode，航线论证统计算法修改

b3b9aa50 · java-李谡 · c50ec7d5 · b3b9aa50 · b3b9aa50
Commit b3b9aa50 authored Apr 23, 2018 by java-李谡
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

StatisticalService.java src/com/ejweb/modules/airport/service/StatisticalService.java +1 -1

UserService.java src/com/ejweb/modules/user/service/UserService.java +0 -0

No files found.
--- a/src/com/ejweb/modules/airport/service/StatisticalService.java
+++ b/src/com/ejweb/modules/airport/service/StatisticalService.java
@@ -61,7 +61,7 @@ public class StatisticalService extends BaseService<StatisticalDao> {
            } else {
                Integer day = dao.getDay(e);
                if (day != null) {
-                    if (day > 180) {
+                    if (day > 180 && Integer.parseInt(e.getExpiryDate()) > 180) {
                        day = 180 - day;
                        e.setExpiryDate(day + "");
                    } else {

--- a/src/com/ejweb/modules/user/service/UserService.java
+++ b/src/com/ejweb/modules/user/service/UserService.java