修改bug

src/main/java/com/care/bms/service/BmsSysUserService.java

@@ -79,8 +79,14 @@ public class BmsSysUserService{
                 Date servStartDate0 = org.getServStartDate();
                 Date servEndDate0 = org.getServEndDate();
 
-                if(servEndDate0 != null || servEndDate0 != null) {
-                    if ( now.before(servStartDate0) || now.after(servEndDate0)) {
+                if(servStartDate0 != null) {
+                    if (now.before(servStartDate0)) {
+                        throw new BDException("该用户所属机构没在有效期");
+                    }
+                }
+
+                if(servEndDate0 != null) {
+                    if (now.after(servEndDate0)) {
                         throw new BDException("该用户所属机构没在有效期");
                     }
                 }
@@ -103,8 +109,13 @@ public class BmsSysUserService{
             }
             Date servStartDate = user.getServStartDate();
             Date servEndDate = user.getServEndDate();
-            if(servStartDate != null || servEndDate != null) {
-                if ( now.before(servStartDate) || now.after(servEndDate)) {
+            if(servStartDate != null) {
+                if ( now.before(servStartDate)) {
+                    throw new BDException("用户没在有效期");
+                }
+            }
+            if(servEndDate != null) {
+                if (now.after(servEndDate)) {
                     throw new BDException("用户没在有效期");
                 }
             }