本地ip bug

bded5070 · renjie · 168395c9 · bded5070
Commit bded5070 authored Mar 25, 2020 by renjie
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

IpResourceServiceImpl.java ...erbackend/browser/service/Impl/IpResourceServiceImpl.java +4 -1

No files found.
--- a/src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
+++ b/src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
@@ -593,9 +593,12 @@ public class IpResourceServiceImpl implements IpResourceService {
                        ipResourceRepository.save(x);
                    }
                    else {
-                        if (x.getStatus() == 0 && x.getStatus() == 1 && x.getStatus() == 2) {
+                        if ((x.getStatus() == 0 || x.getStatus() == 1 || x.getStatus() == 2) && !x.getVendor().equals(Vendor.local)) {
                            x.setStatus(0);
                            ipResourceRepository.save(x);
+                        } else if (x.getIpType().equals(IpType.LOCAL) && (x.getStatus() == 1 || x.getStatus() == 2) && x.getAddr().equals("本地Ip未使用") ) {
+                            x.setStatus(4);
+                            ipResourceRepository.save(x);
                        }
                    }
                }