Merge branch 'fix/meeting0629' into 'develop'

1、创建encryptKey时提示增加please restart sever,2、修改会议室显示问题

See merge request o2oa/o2oa!916

o2server/x_console/src/main/java/com/x/server/console/action/ActionCreateEncryptKey.java

@@ -51,7 +51,7 @@ public class ActionCreateEncryptKey extends ActionBase {
 		//为前端提供publicKey,为密码加密
 		this.writeConfigFile(new String(Base64.encodeBase64(pair.getPublic().getEncoded())));
 		
-		System.out.println("public key: config/public.key, private key: config/private.key, create key success!");
+		System.out.println("public key: config/public.key, private key: config/private.key, create key success. Please  restart server!");
 		
 		return true;
 	}

o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java

@@ -163,8 +163,10 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
-		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
+		//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), start);
+		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.completedTime), end));
 		cq.select(root.get(Meeting_.id)).where(p);
 		return em.createQuery(cq).getResultList();
 	}
@@ -174,8 +176,10 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
-		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
+		//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), start);
+		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.completedTime), end));
 		p = cb.and(p,
 				cb.or(cb.equal(root.get(Meeting_.applicant), person), cb.equal(root.get(Meeting_.auditor), person),
 						cb.isMember(person, root.get(Meeting_.invitePersonList))));

o2server/x_meeting_assemble_control/src/main/webapp/describe/sources/com/x/meeting/assemble/control/factory/MeetingFactory.java

@@ -163,8 +163,10 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
-		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
+		//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), start);
+		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.completedTime), end));
 		cq.select(root.get(Meeting_.id)).where(p);
 		return em.createQuery(cq).getResultList();
 	}
@@ -174,8 +176,10 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
-		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), start);
+		//p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.startTime), end));
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), start);
+		p = cb.and(p, cb.lessThanOrEqualTo(root.get(Meeting_.completedTime), end));
 		p = cb.and(p,
 				cb.or(cb.equal(root.get(Meeting_.applicant), person), cb.equal(root.get(Meeting_.auditor), person),
 						cb.isMember(person, root.get(Meeting_.invitePersonList))));

o2server/x_organization_assemble_authentication/src/main/java/com/x/organization/assemble/authentication/jaxrs/authentication/ExceptionPasswordEmpty.java

@@ -7,6 +7,6 @@ class ExceptionPasswordEmpty extends PromptException {
 	private static final long serialVersionUID = 1859164370743532895L;
 
 	ExceptionPasswordEmpty() {
-		super("密码不能为空.");
+		super("密码不能为空或者密码解密错误.");
 	}
 }