Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1871

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/DocumentQueryService.java

@@ -569,6 +569,7 @@ public class DocumentQueryService {
 	public boolean getFileInfoManagerAssess(EffectivePerson effectivePerson, Document doc, CategoryInfo category, AppInfo appInfo ) throws Exception {
 		List<String> setting_permissonNames = new ArrayList<>();
 		List<String> own_permissonNames = new ArrayList<>();
+		own_permissonNames.add(effectivePerson.getDistinguishedName());
 		own_permissonNames.addAll(userManagerService.listIdentitiesWithPerson( effectivePerson.getDistinguishedName()));
 		own_permissonNames.addAll(userManagerService.listUnitNamesWithPerson( effectivePerson.getDistinguishedName()));
 		own_permissonNames.addAll(userManagerService.listGroupNamesByPerson( effectivePerson.getDistinguishedName()));

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2Count.java

@@ -25,8 +25,8 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Task;
-import com.x.processplatform.core.entity.content.Task_;
+import com.x.processplatform.core.entity.content.ReadCompleted;
+import com.x.processplatform.core.entity.content.ReadCompleted_;
 
 class V2Count extends V2Base {
 
@@ -59,16 +59,16 @@ class V2Count extends V2Base {
 	}
 
 	private Long count(Business business, Predicate predicate) throws Exception {
-		return business.entityManagerContainer().count(Task.class, predicate);
+		return business.entityManagerContainer().count(ReadCompleted.class, predicate);
 	}
 
 	private List<NameValueCountPair> groupByApplication(Business business, Predicate predicate) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(Task.class);
+		EntityManager em = business.entityManagerContainer().get(ReadCompleted.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-		Root<Task> root = cq.from(Task.class);
-		Path<String> pathApplication = root.get(Task_.application);
-		Path<String> pathApplicationName = root.get(Task_.applicationName);
+		Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+		Path<String> pathApplication = root.get(ReadCompleted_.application);
+		Path<String> pathApplicationName = root.get(ReadCompleted_.applicationName);
 		cq.multiselect(pathApplication, pathApplicationName, cb.count(root)).where(predicate).groupBy(pathApplication);
 		List<Tuple> os = em.createQuery(cq).getResultList();
 		List<NameValueCountPair> list = new ArrayList<>();
@@ -85,12 +85,12 @@ class V2Count extends V2Base {
 	}
 
 	private List<NameValueCountPair> groupByProcess(Business business, Predicate predicate) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(Task.class);
+		EntityManager em = business.entityManagerContainer().get(ReadCompleted.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-		Root<Task> root = cq.from(Task.class);
-		Path<String> pathProcess = root.get(Task_.process);
-		Path<String> pathProcessName = root.get(Task_.processName);
+		Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+		Path<String> pathProcess = root.get(ReadCompleted_.process);
+		Path<String> pathProcessName = root.get(ReadCompleted_.processName);
 		cq.multiselect(pathProcess, pathProcessName, cb.count(root)).where(predicate).groupBy(pathProcess);
 		List<Tuple> os = em.createQuery(cq).getResultList();
 		List<NameValueCountPair> list = new ArrayList<>();
@@ -107,11 +107,11 @@ class V2Count extends V2Base {
 	}
 
 	private List<NameValueCountPair> groupByCreatorPerson(Business business, Predicate predicate) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(Task.class);
+		EntityManager em = business.entityManagerContainer().get(ReadCompleted.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-		Root<Task> root = cq.from(Task.class);
-		Path<String> pathCreatorPerson = root.get(Task_.creatorPerson);
+		Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+		Path<String> pathCreatorPerson = root.get(ReadCompleted_.creatorPerson);
 		cq.multiselect(pathCreatorPerson, cb.count(root)).where(predicate).groupBy(pathCreatorPerson);
 		List<Tuple> os = em.createQuery(cq).getResultList();
 		List<NameValueCountPair> list = new ArrayList<>();
@@ -128,11 +128,11 @@ class V2Count extends V2Base {
 	}
 
 	private List<NameValueCountPair> groupByCreatorUnit(Business business, Predicate predicate) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(Task.class);
+		EntityManager em = business.entityManagerContainer().get(ReadCompleted.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-		Root<Task> root = cq.from(Task.class);
-		Path<String> pathCreatorUnit = root.get(Task_.creatorUnit);
+		Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+		Path<String> pathCreatorUnit = root.get(ReadCompleted_.creatorUnit);
 		cq.multiselect(pathCreatorUnit, cb.count(root)).where(predicate).groupBy(pathCreatorUnit);
 		List<Tuple> os = em.createQuery(cq).getResultList();
 		List<NameValueCountPair> list = new ArrayList<>();
@@ -149,11 +149,11 @@ class V2Count extends V2Base {
 	}
 
 	private List<NameValueCountPair> groupByStartTimeMonth(Business business, Predicate predicate) throws Exception {
-		EntityManager em = business.entityManagerContainer().get(Task.class);
+		EntityManager em = business.entityManagerContainer().get(ReadCompleted.class);
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-		Root<Task> root = cq.from(Task.class);
-		Path<String> pathStartTimeMonth = root.get(Task_.startTimeMonth);
+		Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+		Path<String> pathStartTimeMonth = root.get(ReadCompleted_.startTimeMonth);
 		cq.multiselect(pathStartTimeMonth, cb.count(root)).where(predicate).groupBy(pathStartTimeMonth);
 		List<Tuple> os = em.createQuery(cq).getResultList();
 		List<NameValueCountPair> list = new ArrayList<>();

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2List.java

@@ -21,8 +21,8 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.ListTools;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
-import com.x.processplatform.core.entity.content.Read_;
+import com.x.processplatform.core.entity.content.ReadCompleted;
+import com.x.processplatform.core.entity.content.ReadCompleted_;
 
 class V2List extends V2Base {
 
@@ -33,18 +33,18 @@ class V2List extends V2Base {
 		if ((!wi.isEmptyFilter()) || ListTools.isNotEmpty(wi.getJobList()) || ListTools.isNotEmpty(wi.getIdList())) {
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				Business business = new Business(emc);
-				EntityManager em = emc.get(Read.class);
+				EntityManager em = emc.get(ReadCompleted.class);
 				CriteriaBuilder cb = em.getCriteriaBuilder();
 				CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-				Root<Read> root = cq.from(Read.class);
+				Root<ReadCompleted> root = cq.from(ReadCompleted.class);
 				Predicate p = this.toFilterPredicate(effectivePerson, business, wi);
 				if (ListTools.isNotEmpty(wi.getJobList())) {
-					p = cb.and(p, root.get(Read_.job).in(wi.getJobList()));
+					p = cb.and(p, root.get(ReadCompleted_.job).in(wi.getJobList()));
 				}
 				if (ListTools.isNotEmpty(wi.getIdList())) {
-					p = cb.and(p, root.get(Read_.id).in(wi.getIdList()));
+					p = cb.and(p, root.get(ReadCompleted_.id).in(wi.getIdList()));
 				}
-				wos = emc.fetch(Read.class, Wo.copier, p);
+				wos = emc.fetch(ReadCompleted.class, Wo.copier, p);
 				this.relate(business, wos, wi);
 			}
 		}
@@ -80,7 +80,7 @@ class V2List extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreateNext.java

@@ -18,8 +18,8 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
-import com.x.processplatform.core.entity.content.Read_;
+import com.x.processplatform.core.entity.content.ReadCompleted;
+import com.x.processplatform.core.entity.content.ReadCompleted_;
 
 class V2ListCreateNext extends V2Base {
 
@@ -28,11 +28,11 @@ class V2ListCreateNext extends V2Base {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Business business = new Business(emc);
-			EntityManager em = emc.get(Read.class);
+			EntityManager em = emc.get(ReadCompleted.class);
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-			Root<Read> root = cq.from(Read.class);
-			Predicate p = cb.equal(root.get(Read_.creatorPerson), effectivePerson.getDistinguishedName());
+			Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+			Predicate p = cb.equal(root.get(ReadCompleted_.creatorPerson), effectivePerson.getDistinguishedName());
 			p = cb.and(p, this.toFilterPredicate(effectivePerson, business, wi));
 			ActionResult<List<Wo>> result = this.standardListNext(Wo.copier, id, count, JpaObject.sequence_FIELDNAME,
 					DESC, p);
@@ -47,7 +47,7 @@ class V2ListCreateNext extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListCreatePrev.java

@@ -18,8 +18,8 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
-import com.x.processplatform.core.entity.content.Read_;
+import com.x.processplatform.core.entity.content.ReadCompleted;
+import com.x.processplatform.core.entity.content.ReadCompleted_;
 
 class V2ListCreatePrev extends V2Base {
 
@@ -28,11 +28,11 @@ class V2ListCreatePrev extends V2Base {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Business business = new Business(emc);
-			EntityManager em = emc.get(Read.class);
+			EntityManager em = emc.get(ReadCompleted.class);
 			CriteriaBuilder cb = em.getCriteriaBuilder();
 			CriteriaQuery<Tuple> cq = cb.createQuery(Tuple.class);
-			Root<Read> root = cq.from(Read.class);
-			Predicate p = cb.equal(root.get(Read_.creatorPerson), effectivePerson.getDistinguishedName());
+			Root<ReadCompleted> root = cq.from(ReadCompleted.class);
+			Predicate p = cb.equal(root.get(ReadCompleted_.creatorPerson), effectivePerson.getDistinguishedName());
 			p = cb.and(p, this.toFilterPredicate(effectivePerson, business, wi));
 			ActionResult<List<Wo>> result = this.standardListPrev(Wo.copier, id, count, JpaObject.sequence_FIELDNAME,
 					DESC, p);
@@ -47,7 +47,7 @@ class V2ListCreatePrev extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListNext.java

@@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
+import com.x.processplatform.core.entity.content.ReadCompleted;
 
 class V2ListNext extends V2Base {
 
@@ -36,7 +36,7 @@ class V2ListNext extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPaging.java

@@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
+import com.x.processplatform.core.entity.content.ReadCompleted;
 
 class V2ListPaging extends V2Base {
 
@@ -24,9 +24,9 @@ class V2ListPaging extends V2Base {
 			ActionResult<List<Wo>> result = new ActionResult<>();
 			Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 			Predicate p = this.toFilterPredicate(effectivePerson, business, wi);
-			List<Wo> wos = emc.fetchDescPaging(Read.class, Wo.copier, p, page, size, Read.sequence_FIELDNAME);
+			List<Wo> wos = emc.fetchDescPaging(ReadCompleted.class, Wo.copier, p, page, size, ReadCompleted.sequence_FIELDNAME);
 			result.setData(wos);
-			result.setCount(emc.count(Read.class, p));
+			result.setCount(emc.count(ReadCompleted.class, p));
 			this.relate(business, result.getData(), wi);
 			return result;
 		}
@@ -38,7 +38,7 @@ class V2ListPaging extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/V2ListPrev.java

@@ -13,7 +13,7 @@ import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.processplatform.assemble.surface.Business;
-import com.x.processplatform.core.entity.content.Read;
+import com.x.processplatform.core.entity.content.ReadCompleted;
 
 class V2ListPrev extends V2Base {
 
@@ -36,7 +36,7 @@ class V2ListPrev extends V2Base {
 
 	public static class Wo extends AbstractWo {
 		private static final long serialVersionUID = -4773789253221941109L;
-		static WrapCopier<Read, Wo> copier = WrapCopierFactory.wo(Read.class, Wo.class,
-				JpaObject.singularAttributeField(Read.class, true, false), JpaObject.FieldsInvisible);
+		static WrapCopier<ReadCompleted, Wo> copier = WrapCopierFactory.wo(ReadCompleted.class, Wo.class,
+				JpaObject.singularAttributeField(ReadCompleted.class, true, false), JpaObject.FieldsInvisible);
 	}
 }

o2web/source/x_desktop/smapsso.html

@@ -85,7 +85,6 @@
                     }
                     var redirect = uri.getData("redirect");
                     redirect = redirect + "&uniqueId=" + uniqueId + "&flushPortalUrl="+flushPortalUrl;
-                    window.open( redirect, "_new");
                     if (xtoken){
                         var res = new Request.JSON({
                             url: o2.filterUrl(address+"?SMAP_SESSION_DATA="+encodeURIComponent(xtoken)+"&appID="+appID+"&date="+(new Date()).getTime()),
@@ -97,7 +96,7 @@
                                 var result = responseJSON.data.value;
 								if(result){
 									if (redirect){
-										window.location = redirect;
+                                        window.location = redirect;
 									}else{
 										window.location = "/";
 									}