Merge branch 'feature/Teamwork.addServices' into 'develop'

Merge of feature/Teamwork.addServices[工作管理]修复部分BUG并且调整部分功能

See merge request o2oa/o2oa!190

o2server/x_okr_assemble_control/src/main/java/com/x/okr/assemble/control/jaxrs/okrworkreportbaseinfo/ActionSaveDraftReport.java

@@ -64,7 +64,7 @@ public class ActionSaveDraftReport extends BaseAction {
 		}
 				
 		//设置当前登录用户为创建工作汇报的用户
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrapIn.setCreatorName( effectivePerson.getDistinguishedName() );
 				wrapIn.setCreatorIdentity( okrUserManagerService.getIdentityWithPerson(effectivePerson.getDistinguishedName()) );
@@ -75,7 +75,7 @@ public class ActionSaveDraftReport extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrapIn.setCreatorUnitName( okrUserManagerService.getUnitNameByIdentity(wrapIn.getCreatorIdentity()));
 			} catch (Exception e) {
@@ -85,7 +85,7 @@ public class ActionSaveDraftReport extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrapIn.setCreatorTopUnitName( okrUserManagerService.getTopUnitNameByIdentity(wrapIn.getCreatorIdentity()) );
 			} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/factory/TaskListFactory.java

@@ -196,7 +196,21 @@ public class TaskListFactory extends AbstractFactory {
 		return em.createQuery(cq.where(p)).getResultList();
 	}
 
-	public Integer maxOrder(String listId) throws Exception {
+	public Integer maxListOrder(String groupId ) throws Exception {
+		if( StringUtils.isEmpty( groupId ) ){
+			throw new Exception("groupId can not be empty!");
+		}
+		EntityManager em = this.entityManagerContainer().get(TaskList.class);
+		CriteriaBuilder cb = em.getCriteriaBuilder();
+		CriteriaQuery<Integer> cq = cb.createQuery(Integer.class);
+		Root<TaskList> root = cq.from(TaskList.class);
+		Predicate p = cb.equal( root.get(TaskList_.taskGroup ), groupId );
+		cq.select( cb.max( root.get( TaskList_.order )));
+		Integer max = em.createQuery(cq.where(p)).getSingleResult();
+		return max == null ? 0 : max;
+	}
+
+	public Integer maxTaskOrder(String listId) throws Exception {
 		if( StringUtils.isEmpty( listId ) ){
 			throw new Exception("listId can not be empty!");
 		}
@@ -204,7 +218,7 @@ public class TaskListFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<Integer> cq = cb.createQuery(Integer.class);
 		Root<TaskListRele> root = cq.from(TaskListRele.class);
-		Predicate p = cb.equal( root.get(TaskListRele_.taskListId), listId );		
+		Predicate p = cb.equal( root.get(TaskListRele_.taskListId), listId );
 		cq.select( cb.max( root.get( TaskListRele_.order )));
 		Integer max = em.createQuery(cq.where(p)).getSingleResult();
 		return max == null ? 0 : max;

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/attachment/ActionDelete.java

@@ -42,7 +42,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try{
 				attachment = attachmentQueryService.get( id );
 				if (null == attachment) {
@@ -58,7 +58,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 				mapping = ThisApplication.context().storageMappings().get(Attachment.class, attachment.getStorage());
 				
@@ -79,7 +79,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				dynamic = dynamicPersistService.deleteAttachment( attachment, effectivePerson );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/attachment/ActionDownload.java

@@ -42,14 +42,14 @@ public class ActionDownload extends BaseAction {
 			logger.error( e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			StorageMapping mapping = ThisApplication.context().storageMappings().get(Attachment.class, attachment.getStorage());
 			wo = new Wo(attachment.readContent(mapping), 
 					this.contentType(false, attachment.getName()), 
 					this.contentDisposition(false, attachment.getName()));
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Dynamic dynamic = dynamicPersistService.downloadAttachmentDynamic(attachment, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/attachment/ActionDownloadStream.java

@@ -42,14 +42,14 @@ public class ActionDownloadStream extends BaseAction {
 			logger.error( e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			StorageMapping mapping = ThisApplication.context().storageMappings().get(Attachment.class, attachment.getStorage());
 			wo = new Wo(attachment.readContent(mapping), 
 					this.contentType(stream, attachment.getName()), 
 					this.contentDisposition(stream, attachment.getName()));
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Dynamic dynamic = dynamicPersistService.downloadAttachmentDynamic(attachment, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/attachment/ActionProjectAttachmentUpload.java

@@ -41,7 +41,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 		Boolean check = true;		
 		Wo wo = new Wo();
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( projectId ) ){
 				check = false;
 				Exception exception = new ExceptionProjectIdEmpty( );
@@ -49,7 +49,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){//判断工作信息是否已经存在
+		if( Boolean.TRUE.equals( check ) ){//判断工作信息是否已经存在
 			try {
 				project = projectQueryService.get( projectId );
 				if (null == project) {
@@ -64,7 +64,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name));
 				/** 禁止不带扩展名的文件上传 */
@@ -79,7 +79,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				mapping = ThisApplication.context().storageMappings().random( Attachment.class );
 			} catch (Exception e) {
@@ -90,7 +90,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				attachment = this.concreteAttachment( mapping, project, fileName, effectivePerson, site );
 				attachment.saveContent(mapping, bytes, fileName);
@@ -107,7 +107,7 @@ public class ActionProjectAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Dynamic dynamic = dynamicPersistService.uploadAttachmentDynamic(attachment, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/attachment/ActionTaskAttachmentUpload.java

@@ -41,7 +41,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 		Boolean check = true;		
 		Wo wo = new Wo();
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( taskId ) ){
 				check = false;
 				Exception exception = new ExceptionTaskIdEmpty( );
@@ -49,7 +49,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){//判断工作信息是否已经存在
+		if( Boolean.TRUE.equals( check ) ){//判断工作信息是否已经存在
 			try {
 				task = taskQueryService.get( taskId );
 				if (null == task) {
@@ -64,7 +64,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				fileName = FilenameUtils.getName(new String(disposition.getFileName().getBytes(DefaultCharset.name_iso_8859_1), DefaultCharset.name));
 				/** 禁止不带扩展名的文件上传 */
@@ -79,7 +79,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				mapping = ThisApplication.context().storageMappings().random( Attachment.class );
 			} catch (Exception e) {
@@ -90,7 +90,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				attachment = this.concreteAttachment( mapping, task, fileName, effectivePerson, site );
 				attachment.saveContent(mapping, bytes, fileName);
@@ -104,7 +104,7 @@ public class ActionTaskAttachmentUpload extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Dynamic dynamic = dynamicPersistService.uploadAttachmentDynamic(attachment, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionCreate.java

@@ -45,27 +45,27 @@ public class ActionCreate extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getTaskId() )) {
 				check = false;
 				Exception exception = new TaskIDEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getContent() )) {
 				check = false;
 				Exception exception = new ChatContentEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getSender() )) {
 				chat.setSender( effectivePerson.getDistinguishedName() );
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( wi.getTaskId() );
 				if ( task == null) {
@@ -85,7 +85,7 @@ public class ActionCreate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				String lobContent = wi.getContent();
 				if( wi.getContent().length() > 70 ) {
@@ -108,7 +108,7 @@ public class ActionCreate extends BaseAction {
 			}			
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				MessageFactory.message_to_chat( chat );
 			} catch (Exception e) {
@@ -116,7 +116,7 @@ public class ActionCreate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Dynamic dynamic = dynamicPersistService.chatPublishDynamic( chat, effectivePerson,  jsonElement.toString() );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionDelete.java

@@ -36,7 +36,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				chat = chatQueryService.get( id );
 				if ( chat == null) {
@@ -52,7 +52,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				chatPersistService.delete( id, effectivePerson );				
 				// 更新缓存
@@ -67,7 +67,7 @@ public class ActionDelete extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.chatDeleteDynamic( chat, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionGet.java

@@ -23,7 +23,7 @@ public class ActionGet extends BaseAction {
 		Chat chat = null;
 		Boolean check = true;
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( id == null || id.isEmpty() ){
 				check = false;
 				Exception exception = new ChatIDEmptyException();
@@ -31,7 +31,7 @@ public class ActionGet extends BaseAction {
 			}
 		}
 
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				chat = chatQueryService.get( id );
 				if( chat == null ) {
@@ -47,7 +47,7 @@ public class ActionGet extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrap = Wo.copier.copy( chat );
 				result.setData( wrap );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionGetContent.java

@@ -18,7 +18,7 @@ public class ActionGetContent extends BaseAction {
 		String chatContent = null;
 		Boolean check = true;
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( id == null || id.isEmpty() ){
 				check = false;
 				Exception exception = new ChatIDEmptyException();
@@ -26,7 +26,7 @@ public class ActionGetContent extends BaseAction {
 			}
 		}
 
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				chatContent = chatQueryService.getContent( id );
 			} catch (Exception e) {
@@ -37,7 +37,7 @@ public class ActionGetContent extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrap = new Wo();
 				wrap.setText( chatContent );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/chat/ActionListNextWithFilter.java

@@ -43,11 +43,11 @@ public class ActionListNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				Long total = chatQueryService.countWithFilter( queryFilter );
 				List<Chat>  chatList = chatQueryService.listWithFilterNext( count, flag, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/config/ActionGet.java

@@ -23,7 +23,7 @@ public class ActionGet extends BaseAction {
 		SystemConfig systemConfig = null;
 		Boolean check = true;
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( id == null || id.isEmpty() ){
 				check = false;
 				Exception exception = new ExceptionConfigIdEmpty();
@@ -31,7 +31,7 @@ public class ActionGet extends BaseAction {
 			}
 		}
 
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				systemConfig = systemConfigQueryService.get( id );
 			} catch (Exception e) {
@@ -42,7 +42,7 @@ public class ActionGet extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( systemConfig == null ) {
 				try {
 					systemConfig = systemConfigQueryService.getByCode( id );
@@ -55,7 +55,7 @@ public class ActionGet extends BaseAction {
 			}
 		}
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrap = Wo.copier.copy( systemConfig );
 				result.setData( wrap );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/config/ActionGetWithCode.java

@@ -23,14 +23,14 @@ public class ActionGetWithCode extends BaseAction {
 		SystemConfig systemConfig = null;
 		Boolean check = true;
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( code == null || code.isEmpty() ){
 				check = false;
 				Exception exception = new ExceptionConfigCodeEmpty();
 				result.error( exception );
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				systemConfig = systemConfigQueryService.getByCode( code );
 			} catch (Exception e) {
@@ -40,7 +40,7 @@ public class ActionGetWithCode extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wrap = Wo.copier.copy( systemConfig );
 				result.setData( wrap );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/config/ActionListAll.java

@@ -23,7 +23,7 @@ public class ActionListAll extends BaseAction {
 		List<SystemConfig> systemConfigList = null;
 		Boolean check = true;
 		
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				systemConfigList = systemConfigQueryService.listAll();
 			} catch (Exception e) {
@@ -33,7 +33,7 @@ public class ActionListAll extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wraps = Wo.copier.copy( systemConfigList );
 				result.setData(wraps);

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/config/ActionSave.java

@@ -34,21 +34,21 @@ public class ActionSave extends BaseAction {
 			result.error( exception );
 			logger.error( e, effectivePerson, request, null);
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn.getConfigCode() == null || wrapIn.getConfigCode().isEmpty() ){
 				check = false;
 				Exception exception = new ExceptionConfigCodeEmpty();
 				result.error( exception );
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn.getConfigName() == null || wrapIn.getConfigName().isEmpty() ){
 				check = false;
 				Exception exception = new ExceptionConfigNameEmpty();
 				result.error( exception );
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				systemConfig = Wi.copier.copy( wrapIn );
 				if( wrapIn.getId() != null && !wrapIn.getId().isEmpty() ){
@@ -61,7 +61,7 @@ public class ActionSave extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 		}
-		if( check ){
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				systemConfig = systemConfigPersistService.save( systemConfig );
 				result.setData( new Wo( systemConfig.getId() ) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/dynamic/ActionListNextWithFilter.java

@@ -44,11 +44,11 @@ public class ActionListNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				List<Dynamic>  dynamicList = null;
 				long total = dynamicQueryService.countWithFilter( queryFilter );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/dynamic/ActionListNextWithProject.java

@@ -51,12 +51,12 @@ public class ActionListNextWithProject extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 			queryFilter.addEqualsTerm( new EqualsTerm("projectId", projectId ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				List<Dynamic>  dynamicList = null;
 				long total = dynamicQueryService.countWithFilter( queryFilter );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/dynamic/ActionListNextWithTask.java

@@ -51,12 +51,12 @@ public class ActionListNextWithTask extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 			queryFilter.addEqualsTerm( new EqualsTerm("taskId", taskId ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				List<Dynamic>  dynamicList = null;
 				long total = dynamicQueryService.countWithFilter( queryFilter );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionDelete.java

@@ -36,7 +36,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				projectExtFieldRele = projectExtFieldReleQueryService.get(flag);
 				if ( projectExtFieldRele == null) {
@@ -52,7 +52,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				projectExtFieldRelePersistService.delete(flag, effectivePerson );
 				
@@ -68,7 +68,7 @@ public class ActionDelete extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.projectExtFieldReleDeleteDynamic( projectExtFieldRele, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionGet.java

@@ -43,7 +43,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					projectExtFieldRele = projectExtFieldReleQueryService.get(id);
 					if ( projectExtFieldRele == null) {
@@ -59,7 +59,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( projectExtFieldRele );
 				} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionGetNextUseableExtFieldName.java

@@ -20,7 +20,7 @@ public class ActionGetNextUseableExtFieldName extends BaseAction {
 		Boolean check = true;
 		Wo wo = new Wo();
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( projectId )) {
 				check = false;
 				Exception exception = new ProjectFlagForQueryEmptyException();
@@ -28,13 +28,13 @@ public class ActionGetNextUseableExtFieldName extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( fieldType )) {
 				fieldType = "TEXT";
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( projectId );
 				if ( project == null) {
@@ -50,7 +50,7 @@ public class ActionGetNextUseableExtFieldName extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			String fieldName = projectExtFieldReleQueryService.getNextUseableExtFieldName( projectId, fieldType );
 			if( StringUtils.isNotEmpty( fieldName )) {
 				wo.setFieldName(fieldName);

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionListWithProject.java

@@ -37,7 +37,7 @@ public class ActionListWithProject extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					projectExtFieldReles = projectExtFieldReleQueryService.listReleWithProject(projectId);
 					if( ListTools.isEmpty( projectExtFieldReles )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/extfield/ActionSave.java

@@ -46,7 +46,7 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( projectExtFieldRele.getProjectId() )) {
 				check = false;
 				Exception exception = new ProjectFlagForQueryEmptyException();
@@ -54,7 +54,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( projectExtFieldRele.getProjectId() );
 				if ( project == null) {
@@ -70,7 +70,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isNotEmpty( projectExtFieldRele.getId() )) {
 				try {
 					projectExtFieldRele_old = projectExtFieldReleQueryService.get( projectExtFieldRele.getId() );
@@ -83,7 +83,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( projectExtFieldRele_old == null ) { //新建
 				fieldName = projectExtFieldReleQueryService.getNextUseableExtFieldName( projectExtFieldRele.getProjectId(), projectExtFieldRele.getDisplayType() );
 			}else {
@@ -98,7 +98,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty(  fieldName )) {
 				//备用属性已经用完了，无法再添加新的属性
 				check = false;
@@ -109,7 +109,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				
 				projectExtFieldRele = projectExtFieldRelePersistService.save( projectExtFieldRele, effectivePerson );
@@ -126,7 +126,7 @@ public class ActionSave extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}			
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.projectExtFieldReleSaveDynamic(projectExtFieldRele_old, projectExtFieldRele, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionAddTask2ListWithBehindTask.java

@@ -49,7 +49,7 @@ public class ActionAddTask2ListWithBehindTask extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskListQueryService.get( taskListId );
 				if ( taskList == null) {
@@ -66,7 +66,7 @@ public class ActionAddTask2ListWithBehindTask extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {				
 				taskListPersistService.addTaskToTaskListWithBehindTask( wi.getTaskId(), taskListId, wi.getBehindTaskId(), effectivePerson );
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionAddTask2ListWithOrderNumber.java

@@ -49,7 +49,7 @@ public class ActionAddTask2ListWithOrderNumber extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskListQueryService.get( taskListId );
 				if ( taskList == null) {
@@ -68,7 +68,7 @@ public class ActionAddTask2ListWithOrderNumber extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {				
 				taskListPersistService.addTaskToTaskListWithOrderNumber( wi.getTaskId(), taskListId, wi.getOrderNumber(), effectivePerson );
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionDelete.java

@@ -27,7 +27,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskListQueryService.get(id);
 				if ( taskList == null) {
@@ -43,7 +43,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				//物理删除
 				taskListPersistService.delete(id, effectivePerson);
@@ -60,7 +60,7 @@ public class ActionDelete extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamicPersistService.taskListDeleteDynamic( taskList, effectivePerson);
 			} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionGet.java

@@ -46,7 +46,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskList = taskListQueryService.get( taskListId );
 				} catch (Exception e) {
@@ -57,7 +57,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					if( taskList != null ) {
 						wo = Wo.copier.copy( taskList );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionList.java

@@ -36,7 +36,7 @@ public class ActionList extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskLists = taskListQueryService.listWithProject( effectivePerson.getDistinguishedName(), projectId );
 					if( ListTools.isNotEmpty( taskLists )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionListWithTaskGroup.java

@@ -37,7 +37,7 @@ public class ActionListWithTaskGroup extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskLists = taskListQueryService.listWithTaskGroup( effectivePerson.getDistinguishedName(), taskGroupId );
 					if( ListTools.isNotEmpty( taskLists )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionListWithTaskGroupWithTask.java

@@ -41,7 +41,7 @@ public class ActionListWithTaskGroupWithTask extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskLists = taskListQueryService.listWithTaskGroup( effectivePerson.getDistinguishedName(), taskGroupId );
 					if( ListTools.isNotEmpty( taskLists )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionRefreshTaskList.java

@@ -41,7 +41,7 @@ public class ActionRefreshTaskList extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskListQueryService.get( id );
 				if ( taskList == null) {
@@ -57,7 +57,7 @@ public class ActionRefreshTaskList extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskListPersistService.refreshTaskListRele(wi.getTaskIds(), id, effectivePerson);
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionRemoveTaskFromList.java

@@ -33,7 +33,7 @@ public class ActionRemoveTaskFromList extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskListQueryService.get( id );
 				if ( taskList == null) {
@@ -49,7 +49,7 @@ public class ActionRemoveTaskFromList extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskListPersistService.removeTaskFromList(taskId, id, effectivePerson);
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/list/ActionSave.java

@@ -34,11 +34,11 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {	
+		if( Boolean.TRUE.equals( check ) ){
 			taskList_old = taskListQueryService.get( wi.getId() );
 		}
 		
-		if (check) {			
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				
 				taskList = taskListPersistService.save( Wi.copier.copy(wi), effectivePerson );
@@ -55,7 +55,7 @@ public class ActionSave extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamicPersistService.taskListSaveDynamic(taskList_old, taskList, effectivePerson,  jsonElement.toString() );
 			} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionDelete.java

@@ -40,7 +40,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get(projectId);
 				if ( project == null) {
@@ -56,7 +56,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				projectPersistService.delete( projectId, effectivePerson );				
 				// 更新缓存
@@ -74,7 +74,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}		
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				new BatchOperationPersistService().addOperation( 
 						BatchOperationProcessService.OPT_OBJ_PROJECT, 
@@ -84,7 +84,7 @@ public class ActionDelete extends BaseAction {
 			}	
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.projectDeleteDynamic( project, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionGet.java

@@ -49,7 +49,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					project = projectQueryService.get(flag);
 					if ( project == null) {
@@ -65,7 +65,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( project );
 					if( wo.getStarPersonList().contains( effectivePerson.getDistinguishedName() )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListArchiveNextWithFilter.java

@@ -52,7 +52,7 @@ public class ActionListArchiveNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,7 +73,7 @@ public class ActionListArchiveNextWithFilter extends BaseAction {
 			queryFilter.addIsTrueTerm( new IsTrueTerm("archive" ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListArchiveNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListCompletedNextWithFilter.java

@@ -52,7 +52,7 @@ public class ActionListCompletedNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,7 +73,7 @@ public class ActionListCompletedNextWithFilter extends BaseAction {
 			queryFilter.addIsTrueTerm( new IsTrueTerm("completed" ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListCompletedNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListMyNextWithFilter.java

@@ -52,7 +52,7 @@ public class ActionListMyNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,7 +73,7 @@ public class ActionListMyNextWithFilter extends BaseAction {
 			queryFilter.addEqualsTerm( new EqualsTerm("executor", effectivePerson.getDistinguishedName() ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListMyNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListNextInGroupWithFilter.java

@@ -51,7 +51,7 @@ public class ActionListNextInGroupWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -67,7 +67,7 @@ public class ActionListNextInGroupWithFilter extends BaseAction {
 			queryFilter.addInTerm( new InTerm("id", new ArrayList<Object>(queryProjectIds) ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListNextInGroupWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListNextWithFilter.java

@@ -51,7 +51,7 @@ public class ActionListNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -70,7 +70,7 @@ public class ActionListNextWithFilter extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListNoGroupNextWithFilter.java

@@ -52,7 +52,7 @@ public class ActionListNoGroupNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,7 +73,7 @@ public class ActionListNoGroupNextWithFilter extends BaseAction {
 			queryFilter.addEqualsTerm( new EqualsTerm("groupCount", 0 ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListNoGroupNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListPageInGroupWithFilter.java

@@ -45,7 +45,7 @@ public class ActionListPageInGroupWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -61,14 +61,14 @@ public class ActionListPageInGroupWithFilter extends BaseAction {
 			queryFilter.addInTerm( new InTerm("id", new ArrayList<Object>(queryProjectIds) ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListPageWithFilter", effectivePerson.getDistinguishedName(), 
 					pageNum, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if ((null != element) && (null != element.getObjectValue())) {
 				resultObject = (ResultObject) element.getObjectValue();
 				result.setCount( resultObject.getTotal() );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListPageWithFilter.java

@@ -47,7 +47,7 @@ public class ActionListPageWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -66,14 +66,14 @@ public class ActionListPageWithFilter extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListPageWithFilter", effectivePerson.getDistinguishedName(), 
 					pageNum, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if ((null != element) && (null != element.getObjectValue())) {
 				resultObject = (ResultObject) element.getObjectValue();
 				result.setCount( resultObject.getTotal() );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListRecycleNextWithFilter.java

@@ -1,12 +1,4 @@
 package com.x.teamwork.assemble.control.jaxrs.project;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.JsonElement;
 import com.x.base.core.entity.JpaObject;
 import com.x.base.core.project.bean.WrapCopier;
@@ -21,14 +13,17 @@ import com.x.teamwork.core.entity.Project;
 import com.x.teamwork.core.entity.tools.filter.QueryFilter;
 import com.x.teamwork.core.entity.tools.filter.term.InTerm;
 import com.x.teamwork.core.entity.tools.filter.term.IsTrueTerm;
-
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import net.sf.ehcache.Element;
+import org.apache.commons.lang3.StringUtils;
 
 public class ActionListRecycleNextWithFilter extends BaseAction {
 
 	private static Logger logger = LoggerFactory.getLogger(ActionListRecycleNextWithFilter.class);
 
-	protected ActionResult<List<Wo>> execute( HttpServletRequest request, EffectivePerson effectivePerson, String flag, Integer count, JsonElement jsonElement ) throws Exception {
+	protected ActionResult<List<Wo>> execute(HttpServletRequest request, EffectivePerson effectivePerson, String flag, Integer count, JsonElement jsonElement ) throws Exception {
 		ActionResult<List<Wo>> result = new ActionResult<>();
 		ResultObject resultObject = null;
 		List<Wo> wos = new ArrayList<>();
@@ -36,7 +31,7 @@ public class ActionListRecycleNextWithFilter extends BaseAction {
 		Boolean check = true;
 		String cacheKey = null;
 		Element element = null;
-		QueryFilter  queryFilter = null;
+		QueryFilter queryFilter = null;
 		List<String> queryProjectIds = new ArrayList<>();
 		
 		if ( StringUtils.isEmpty( flag ) || "(0)".equals(flag)) {
@@ -52,7 +47,7 @@ public class ActionListRecycleNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ) {
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,8 +68,8 @@ public class ActionListRecycleNextWithFilter extends BaseAction {
 			queryFilter.addIsTrueTerm( new IsTrueTerm("deleted" ));
 		}
 		
-		if( check ) {
-			cacheKey = ApplicationCache.concreteCacheKey( "ActionListRecycleNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
+		if( Boolean.TRUE.equals( check ) ) {
+			cacheKey = ApplicationCache.concreteCacheKey( "ActionListRecycleNextWithFilter", effectivePerson.getDistinguishedName(), flag, count,
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );
 			
@@ -117,12 +112,11 @@ public class ActionListRecycleNextWithFilter extends BaseAction {
 						result.setData( resultObject.getWos() );
 					}
 				} catch (Exception e) {
-					check = false;
 					logger.warn("系统查询项目信息列表时发生异常!");
 					result.error(e);
 					logger.error(e, effectivePerson, request, null);
 				}
-			}		
+			}
 		}
 		return result;
 	}

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListStarNextWithFilter.java

@@ -52,7 +52,7 @@ public class ActionListStarNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( wrapIn == null ) {
 				wrapIn = new Wi();
 			}
@@ -73,7 +73,7 @@ public class ActionListStarNextWithFilter extends BaseAction {
 			queryFilter.addMemberTerm( new MemberTerm("starPersonList", effectivePerson.getDistinguishedName() ));
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListStarNextWithFilter", effectivePerson.getDistinguishedName(), flag, count, 
 					wrapIn.getOrderField(), wrapIn.getOrderType(), 	queryFilter.getContentSHA1() );
 			element = projectCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionSave.java

@@ -46,7 +46,7 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if ( !projectPersistService.checkPermissionForPersist( effectivePerson, systemConfigQueryService.getValueByCode("PROJECT_CREATOR")) ) {
 				check = false;
 				Exception exception = new ProjectPersistException("project save permission denied!" );
@@ -54,11 +54,11 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {	
+		if( Boolean.TRUE.equals( check ) ){
 			old_project = projectQueryService.get( wi.getId() );
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			ProjectDetail projectDetail = new ProjectDetail();
 			projectDetail.setDescription( wi.getDescription() );
 			
@@ -89,7 +89,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				new BatchOperationPersistService().addOperation( 
 						BatchOperationProcessService.OPT_OBJ_PROJECT, 
@@ -99,7 +99,7 @@ public class ActionSave extends BaseAction {
 			}	
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				List<Dynamic> dynamics = dynamicPersistService.projectSaveDynamic(old_project, project, effectivePerson,  jsonElement.toString() );
 				if( dynamics == null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionStar.java

@@ -27,7 +27,7 @@ public class ActionStar extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get(flag);
 				if ( project == null) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionStatisticMyProjects.java

@@ -49,7 +49,7 @@ public class ActionStatisticMyProjects extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询我参与的所有项目
 					projectIds = projectQueryService.listAllViewableProjectIds( effectivePerson, 2000, new QueryFilter() );
@@ -64,7 +64,7 @@ public class ActionStatisticMyProjects extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询我所有的项目组列表
 					projectGroupList = projectGroupQueryService.listGroupByPerson( effectivePerson.getDistinguishedName() );
@@ -76,14 +76,14 @@ public class ActionStatisticMyProjects extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( projectGroupList )) {
 					woGroupList = WoGroup.copier.copy( projectGroupList );
 					SortTools.asc( woGroupList, "createTime");
 				}
 			}			
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( projectList )) {
 					for(  Project project : projectList ) {
 						allCount++;						
@@ -110,7 +110,7 @@ public class ActionStatisticMyProjects extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = new Wo();
 					wo.setAllCount( allCount );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionStatisticMyProjectsGroups.java

@@ -41,7 +41,7 @@ public class ActionStatisticMyProjectsGroups extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询我参与的所有项目
 					projectIds = projectQueryService.listAllViewableProjectIds( effectivePerson, 2000, new QueryFilter() );
@@ -56,7 +56,7 @@ public class ActionStatisticMyProjectsGroups extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询我所有的项目组列表
 					projectGroupList = projectGroupQueryService.listGroupByPerson( effectivePerson.getDistinguishedName() );
@@ -68,14 +68,14 @@ public class ActionStatisticMyProjectsGroups extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( projectGroupList )) {
 					woGroupList = WoGroup.copier.copy( projectGroupList );
 					SortTools.asc( woGroupList, "createTime");
 				}
 			}			
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( projectList )) {
 					for(  Project project : projectList ) {
 						woGroupList = checkGroup( project, woGroupList );
@@ -83,7 +83,7 @@ public class ActionStatisticMyProjectsGroups extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = new Wo();
 					if( ListTools.isNotEmpty( woGroupList )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionUnStar.java

@@ -27,7 +27,7 @@ public class ActionUnStar extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get(flag);
 				if ( project == null) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionUpdateIcon.java

@@ -31,7 +31,7 @@ public class ActionUpdateIcon extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if ( !projectPersistService.checkPermissionForPersist( effectivePerson, systemConfigQueryService.getValueByCode("PROJECT_CREATOR")) ) {
 				check = false;
 				Exception exception = new ProjectPersistException("project save permission denied!" );
@@ -39,7 +39,7 @@ public class ActionUpdateIcon extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( projectId );
 				if ( project == null) {
@@ -55,7 +55,7 @@ public class ActionUpdateIcon extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {	
 				projectPersistService.saveProjectIcon( projectId, wi.getIcon() );
 

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/projectgroup/ActionDelete.java

@@ -37,7 +37,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				projectGroup = projectGroupQueryService.get(flag);
 				if ( projectGroup == null) {
@@ -53,7 +53,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				projectGroupPersistService.delete(flag, effectivePerson );				
 				// 更新缓存
@@ -69,7 +69,7 @@ public class ActionDelete extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.projectGroupDeleteDynamic( projectGroup, effectivePerson );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/projectgroup/ActionGet.java

@@ -43,7 +43,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					projectGroup = projectGroupQueryService.get( id );
 					if ( projectGroup == null) {
@@ -59,7 +59,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( projectGroup );					
 					projectGroupCache.put(new Element(cacheKey, wo));

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/projectgroup/ActionList.java

@@ -37,7 +37,7 @@ public class ActionList extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					projectGroups = projectGroupQueryService.listGroupByPerson( effectivePerson.getDistinguishedName() );
 					if( ListTools.isNotEmpty( projectGroups )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/projectgroup/ActionListWithFilter.java

@@ -51,7 +51,7 @@ public class ActionListWithFilter extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					projectGroups = projectGroupQueryService.list( wi.getIds() );
 				} catch (Exception e) {
@@ -63,7 +63,7 @@ public class ActionListWithFilter extends BaseAction {
 				
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( projectGroups )) {
 					wos = Wo.copier.copy( projectGroups );					
 					SortTools.asc( wos, "createTime");					

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/projectgroup/ActionSave.java

@@ -41,11 +41,11 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			projectGroup_old = projectGroupQueryService.get( wi.getId() );
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				projectGroup = projectGroupPersistService.save( wi, effectivePerson );
 				
@@ -62,7 +62,7 @@ public class ActionSave extends BaseAction {
 				logger.error(e, effectivePerson, request, null);
 			}			
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.projectGroupSaveDynamic(projectGroup_old, projectGroup, effectivePerson,  jsonElement.toString() );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionArchive.java

@@ -34,7 +34,7 @@ public class ActionArchive extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( taskId );
 				if ( task == null) {
@@ -50,7 +50,7 @@ public class ActionArchive extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//工作创建者、工作负责人、管理者和系统管理员有归档权限
 			if( !hasArchivePermission( task, effectivePerson )) {
 				check = false;
@@ -59,7 +59,7 @@ public class ActionArchive extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskPersistService.archiveTask( taskId );
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionDelete.java

@@ -42,7 +42,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get(flag);
 				if ( task == null) {
@@ -58,7 +58,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskPersistService.delete(flag, effectivePerson );
 				//taskGroupPersistService.refreshTaskCountInTaskGroupWithTaskId( effectivePerson.getDistinguishedName(), flag );
@@ -79,7 +79,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				new BatchOperationPersistService().addOperation( 
 						BatchOperationProcessService.OPT_OBJ_TASK, 
@@ -89,7 +89,7 @@ public class ActionDelete extends BaseAction {
 			}	
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isNotEmpty( task.getParent() )) {
 				Task parentTask = taskQueryService.get( task.getParent() );
 				if( parentTask != null ) {
@@ -102,7 +102,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				MessageFactory.message_to_teamWorkDelete(task);
 			} catch (Exception e) {
@@ -110,7 +110,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				Dynamic dynamic = dynamicPersistService.taskDeleteDynamic( task, effectivePerson );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionGet.java

@@ -48,7 +48,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					task = taskQueryService.get( flag );
 					if ( task == null) {
@@ -64,7 +64,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskDetail = taskQueryService.getDetail( flag );
 				} catch (Exception e) {
@@ -75,7 +75,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskExtField = taskQueryService.getExtField( flag );
 				} catch (Exception e) {
@@ -86,7 +86,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					extFieldReleList = projectExtFieldReleQueryService.listReleWithProject( task.getProject() );
 				} catch (Exception e) {
@@ -97,7 +97,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( task );
 					if ( wo != null && taskDetail != null) {
@@ -130,7 +130,7 @@ public class ActionGet extends BaseAction {
 			}
 
 			//查询任务所在的Group信息
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				List<String> groupIds = null;
 				try {
 					groupIds = taskGroupQueryService.listGroupIdsByTask( task.getId() );
@@ -146,7 +146,7 @@ public class ActionGet extends BaseAction {
 			}
 
 			//查询任务所在的List信息
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( StringUtils.isNotEmpty(wo.getTaskGroupId() )){
 					List<String> listIds = null;
 					try {
@@ -163,7 +163,7 @@ public class ActionGet extends BaseAction {
 			}
 
 //			//查询任务所在的Group信息
-//			if (check) {
+//			if( Boolean.TRUE.equals( check ) ){
 //				List<String> groupIds = null;
 //				List<TaskGroup> groupList = null;
 //				List<WoTaskGroup> woGroupList = new ArrayList<>();
@@ -183,7 +183,7 @@ public class ActionGet extends BaseAction {
 //			}
 //
 //			//查询任务所在的List信息
-//			if (check) {
+//			if( Boolean.TRUE.equals( check ) ){
 //				if( ListTools.isNotEmpty(wo.getTaskgroups() )){
 //					List<String> listIds = null;
 //					List<TaskList> taskLists = null;

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListMyTaskWithTaskList.java

@@ -41,7 +41,7 @@ public class ActionListMyTaskWithTaskList extends BaseAction {
 			result.error(exception);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListMyTaskWithTaskList", taskListId );
 			element = taskCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListNextWithFilter.java

@@ -53,11 +53,11 @@ public class ActionListNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListNext", effectivePerson.getDistinguishedName(),  
 					flag, count, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() );
 			element = taskCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListPageWithFilter.java

@@ -49,13 +49,13 @@ public class ActionListPageWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
-			if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
+			if( Boolean.TRUE.equals( check ) ){
 				queryFilter = wrapIn.getQueryFilter();
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListPage", effectivePerson.getDistinguishedName(), 
 					pageNum, pageSize, wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() );
 			element = taskCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListSubTaskWithTaskId.java

@@ -38,7 +38,7 @@ public class ActionListSubTaskWithTaskId extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( taskId );
 				if ( task == null) {
@@ -54,7 +54,7 @@ public class ActionListSubTaskWithTaskId extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskList = taskQueryService.listTaskWithParentId( taskId, effectivePerson );
 				if( taskList == null ) {
@@ -68,7 +68,7 @@ public class ActionListSubTaskWithTaskId extends BaseAction {
 			}
 		}
 				
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				wos = Wo.copier.copy( taskList );
 				if(ListTools.isNotEmpty( wos )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionListWithTaskList.java

@@ -41,7 +41,7 @@ public class ActionListWithTaskList extends BaseAction {
 			result.error(exception);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithTaskList", taskListId );
 			element = taskCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionManagerUpdate.java

@@ -54,7 +54,7 @@ public class ActionManagerUpdate extends BaseAction {
 			result.error( exception );
 		}
 		
-		if (check) {	
+		if( Boolean.TRUE.equals( check ) ){
 			task = taskQueryService.get( id );
 			if( task == null ) {
 				check = false;
@@ -63,7 +63,7 @@ public class ActionManagerUpdate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			old_managers = task.getManageablePersonList();
 			new_managers = wi.getManageablePersonList();
 			if( ListTools.isNotEmpty( wi.getManageablePersonList() ) ) {
@@ -84,7 +84,7 @@ public class ActionManagerUpdate extends BaseAction {
 				}
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			List<String> addManagers = new ArrayList<>();
 			List<String> removeManagers = new ArrayList<>();
 			if( old_managers == null ) { old_managers = new ArrayList<>(); }
@@ -100,7 +100,7 @@ public class ActionManagerUpdate extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {					
 					new BatchOperationPersistService().addOperation( 
 							BatchOperationProcessService.OPT_OBJ_TASK, 
@@ -110,7 +110,7 @@ public class ActionManagerUpdate extends BaseAction {
 				}	
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					MessageFactory.message_to_teamWorkUpdateManagers( task, addManagers );
 				} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionParticipantUpdate.java

@@ -54,7 +54,7 @@ public class ActionParticipantUpdate extends BaseAction {
 			result.error( exception );
 		}
 		
-		if (check) {	
+		if( Boolean.TRUE.equals( check ) ){
 			task = taskQueryService.get( id );
 			if( task == null ) {
 				check = false;
@@ -63,7 +63,7 @@ public class ActionParticipantUpdate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			old_participants = task.getParticipantList();
 			new_participants = wi.getParticipantList();
 			if( ListTools.isNotEmpty( wi.getParticipantList() ) ) {
@@ -84,7 +84,7 @@ public class ActionParticipantUpdate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			List<String> addParticipants = new ArrayList<>();
 			List<String> removeParticipants = new ArrayList<>();
 			if( old_participants == null ) { old_participants = new ArrayList<>(); }
@@ -100,7 +100,7 @@ public class ActionParticipantUpdate extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {					
 					new BatchOperationPersistService().addOperation( 
 							BatchOperationProcessService.OPT_OBJ_TASK, 
@@ -110,7 +110,7 @@ public class ActionParticipantUpdate extends BaseAction {
 				}	
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					MessageFactory.message_to_teamWorkUpdateParticipants( task, addParticipants );
 				} catch (Exception e) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionSave.java

@@ -63,7 +63,7 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				oldTask = taskQueryService.get( wi.getId() );
 			} catch (Exception e) {
@@ -74,7 +74,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				oldTaskDetail = taskQueryService.getDetail( wi.getId() );
 			} catch (Exception e) {
@@ -85,13 +85,13 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getProject() ) && oldTask != null ) {
 				wi.setProject( oldTask.getProject() );
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getTaskGroupId() ) && StringUtils.isEmpty( wi.getProject() )  ) {
 				check = false;
 				Exception exception = new TaskGroupIdAndProjectEmptyException( );
@@ -99,7 +99,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isNotEmpty( wi.getTaskGroupId()) ) {
 				try {
 					taskGroup = taskGroupQueryService.get( wi.getTaskGroupId() );
@@ -119,7 +119,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( wi.getProject() );
 				if( project == null ) {
@@ -135,7 +135,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if ( !taskPersistService.checkPermissionForPersist( project, effectivePerson ) ) {
 				check = false;
 				Exception exception = new TaskPersistException("task save permission denied!" );
@@ -143,14 +143,14 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( taskGroup == null ) {
 				//查询默认的全部工作的taskGroup
 				taskGroup = taskGroupQueryService.getDefaultTaskGroupWithProject( effectivePerson, project.getId() );
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//校验parentID， 确认上级任务是否存在， parentId = "0"或者为空都不会视为工作拆解
 			if( StringUtils.isNotEmpty( wi.getParent() ) && !wi.getParent().equalsIgnoreCase( "0" ) && !wi.getParent().equalsIgnoreCase( wi.getId() )) {
 				try {
@@ -174,7 +174,7 @@ public class ActionSave extends BaseAction {
 			}
 		}		
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//如果是标识为已完成，那么需要判断一下，该任务的所有下级任务是否全部都已经完成，否则不允许标识为已完成
 			if( TaskStatuType.completed.name().equalsIgnoreCase( wi.getWorkStatus() )) {
 				List<Task> unCompletedTasks =  taskQueryService.allUnCompletedSubTasks( wi.getId() );
@@ -186,7 +186,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			TaskDetail taskDetail = new TaskDetail();
 			taskDetail.setId( wi.getId() );
 			taskDetail.setProject( project.getId() );
@@ -227,7 +227,7 @@ public class ActionSave extends BaseAction {
 		}
 
 		//查询该任务和任务组的绑定情况
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( !taskGroupQueryService.existsWithTaskAndGroup( wi.getTaskGroupId(), task.getId() )){
 				//添加任务和任务组的关联
 				taskGroupPersistService.addTaskToGroup( task.getId(), wi.getTaskGroupId() );
@@ -236,7 +236,7 @@ public class ActionSave extends BaseAction {
 		}
 
 		//检查标签是否有变动
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//检查任务和标签的所有关联
 			List<String> tagIds = taskTagQueryService.listTagIdsWithTask( effectivePerson, task.getId() );
 			if( ListTools.isNotEmpty( wi.getTaskTagIds() )) {
@@ -311,7 +311,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				new BatchOperationPersistService().addOperation( 
 						BatchOperationProcessService.OPT_OBJ_TASK, 
@@ -321,7 +321,7 @@ public class ActionSave extends BaseAction {
 			}	
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//记录父工作任务拆解的动态记录
 			if( split && parentTask != null ) {
 				dynamics = new ArrayList<>();
@@ -333,19 +333,19 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				if( oldTask == null ) {
 					MessageFactory.message_to_teamWorkCreate( task );
 				}else {
-					MessageFactory.message_to_teamWorkUpdate( task );
+					MessageFactory.message_to_teamWorkUpdate( task, null );
 				}
 			} catch (Exception e) {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//记录工作任务信息变化记录
 			try {
 				if( ListTools.isNotEmpty( dynamics ) ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionStatisticMyTaskViews.java

@@ -39,7 +39,7 @@ public class ActionStatisticMyTaskViews extends BaseAction {
 			wo = ( Wo ) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询用户在该项目中所有的视图信息
 					taskViewList = taskViewQueryService.listViewWithPersonAndProject( effectivePerson, projectId );
@@ -50,14 +50,14 @@ public class ActionStatisticMyTaskViews extends BaseAction {
 					logger.error(e, effectivePerson, request, null);
 				}
 			}
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( taskGroupList )) {
 					woGroupList = WoTaskGroup.copier.copy( taskGroupList );
 					SortTools.asc( woGroupList, "createTime");
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( taskViewList )) {
 					woViewList = WoTaskView.copier.copy( taskViewList );
 					SortTools.asc( woViewList, "createTime");
@@ -65,7 +65,7 @@ public class ActionStatisticMyTaskViews extends BaseAction {
 			}	
 			
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo.setViews( woViewList );
 					taskCache.put( new Element( cacheKey, wo) );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionStatisticMyTasks.java

@@ -46,7 +46,7 @@ public class ActionStatisticMyTasks extends BaseAction {
 			Integer completedTotal = 0;
 			Integer overtimeTotal = 0;
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询用户在该项目中所有工作任务组信息，如果没有，则需要创建一个工作任务组，将所有的工作任务添加到该工作任务组中
 					taskGroupList = taskGroupQueryService.listGroupByPersonAndProject( effectivePerson, projectId );
@@ -58,7 +58,7 @@ public class ActionStatisticMyTasks extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					//查询用户在该项目中所有的视图信息
 					taskViewList = taskViewQueryService.listViewWithPersonAndProject( effectivePerson, projectId );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/task/ActionUpdateSingleProperty.java

@@ -35,6 +35,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 
 	protected ActionResult<Wo> execute( HttpServletRequest request, EffectivePerson effectivePerson, String taskId, JsonElement jsonElement ) throws Exception {
 		ActionResult<Wo> result = new ActionResult<>();
+		Task newTask = null;
 		Task oldTask = null;
 		TaskDetail oldDetail = null;
 		TaskExtField oldExtField = null;
@@ -53,7 +54,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				oldTask = taskQueryService.get( taskId );
 				if( oldTask == null ) {
@@ -69,7 +70,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				oldDetail = taskQueryService.getDetail( taskId );
 				if( oldDetail == null ) {
@@ -83,7 +84,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				oldExtField = taskQueryService.getExtField( taskId );
 				if( oldExtField == null ) {
@@ -97,7 +98,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//如果是标识为已完成，那么需要判断一下，该任务的所有下级任务是否全部都已经完成，否则不允许标识为已完成
 			if( Task.workStatus_FIELDNAME.equalsIgnoreCase(wi.getProperty()) && TaskStatuType.completed.name().equalsIgnoreCase( wi.getMainValue().toString() )) {
 				List<Task> unCompletedTasks =  taskQueryService.allUnCompletedSubTasks( taskId );
@@ -109,7 +110,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}
 		}
 		
-		if (check) {	
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				if( TaskDetail.description_FIELDNAME.equalsIgnoreCase( wi.getProperty() )) {
 					dynamicInfo = changeTaskProperty( 
@@ -135,6 +136,8 @@ public class ActionUpdateSingleProperty extends BaseAction {
 					dynamicInfo = changeTaskProperty( 
 							effectivePerson.getName(), oldTask.getProject(), taskId, "工作负责人", "UPDATE_EXECUTOR", 
 							wi.getProperty(), oldTask.getExecutor(), wi.getMainValue(), wi.getSecondaryValue(), wi.getDataType(), false );
+					//也要给新的工作负责人发送通知
+					newTask = taskQueryService.get( taskId );
 				} else if( Task.startTime_FIELDNAME.equalsIgnoreCase( wi.getProperty() )) {
 					dynamicInfo = changeTaskProperty( 
 							effectivePerson.getName(), oldTask.getProject(), taskId, "任务开始日期", "UPDATE_STARTDATE", 
@@ -199,7 +202,7 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				new BatchOperationPersistService().addOperation( 
 						BatchOperationProcessService.OPT_OBJ_TASK, 
@@ -209,15 +212,15 @@ public class ActionUpdateSingleProperty extends BaseAction {
 			}	
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
-				MessageFactory.message_to_teamWorkUpdate( oldTask );
+				MessageFactory.message_to_teamWorkUpdate( oldTask, newTask );
 			} catch (Exception e) {
 				logger.error(e, effectivePerson, request, null);
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			//记录工作任务属性信息变化记录
 			try {
 				dynamics = dynamicPersistService.taskUpdatePropertyDynamic( oldTask,  dynamicInfo.getTitle(), dynamicInfo.getOptType(), dynamicInfo.getDescription(), effectivePerson );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskgroup/ActionDelete.java

@@ -28,7 +28,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskGroup = taskGroupQueryService.get(flag);
 				if ( taskGroup == null) {
@@ -44,7 +44,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskGroupPersistService.delete(flag, effectivePerson );				
 				// 更新缓存

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskgroup/ActionGet.java

@@ -43,7 +43,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskGroup = taskGroupQueryService.get( id );
 					if ( taskGroup == null) {
@@ -59,7 +59,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( taskGroup );					
 					taskGroupCache.put(new Element(cacheKey, wo));

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskgroup/ActionList.java

@@ -39,7 +39,7 @@ public class ActionList extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					project = projectQueryService.get( projectId );
 					if ( project == null) {
@@ -55,7 +55,7 @@ public class ActionList extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskGroups = taskGroupQueryService.listGroupByPersonAndProject(effectivePerson, projectId );
 					if( ListTools.isNotEmpty( taskGroups )) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskgroup/ActionListWithFilter.java

@@ -51,7 +51,7 @@ public class ActionListWithFilter extends BaseAction {
 			wos = (List<Wo>) element.getObjectValue();
 			result.setData( wos );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskGroups = taskGroupQueryService.list( wi.getIds() );
 				} catch (Exception e) {
@@ -63,7 +63,7 @@ public class ActionListWithFilter extends BaseAction {
 				
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				if( ListTools.isNotEmpty( taskGroups )) {
 					wos = Wo.copier.copy( taskGroups );					
 					SortTools.asc( wos, "createTime");					

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskgroup/ActionSave.java

@@ -36,7 +36,7 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( wi.getProject() );
 				if( project == null ) {
@@ -52,7 +52,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				taskGroup = taskGroupPersistService.save( wi, effectivePerson );
 				

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionAddTagRele.java

@@ -35,14 +35,14 @@ public class ActionAddTagRele extends BaseAction {
 		Wo wo = new Wo();
 		Boolean check = true;
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( taskId )) {
 				check = false;
 				Exception exception = new TaskIdEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( tagId )) {
 				check = false;
 				Exception exception = new TagIdEmptyException();
@@ -50,7 +50,7 @@ public class ActionAddTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( taskId );
 				if ( task == null) {
@@ -66,7 +66,7 @@ public class ActionAddTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskTag = taskTagQueryService.get( tagId );
 				if ( taskTag == null) {
@@ -82,7 +82,7 @@ public class ActionAddTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				
 				rele = taskTagPersistService.addTagRele( task, taskTag, effectivePerson );
@@ -102,7 +102,7 @@ public class ActionAddTagRele extends BaseAction {
 			}			
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamic = dynamicPersistService.addTaskTagReleDynamic( task, taskTag, effectivePerson );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionCreate.java

@@ -44,21 +44,21 @@ public class ActionCreate extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getProject() )) {
 				check = false;
 				Exception exception = new ProjectIdEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getTag() )) {
 				check = false;
 				Exception exception = new TagEmptyException();
 				result.error(exception);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getTagColor() )) {
 				check = false;
 				Exception exception = new TagColorEmptyException();
@@ -66,7 +66,7 @@ public class ActionCreate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( wi.getProject() );
 				if ( project == null) {
@@ -82,7 +82,7 @@ public class ActionCreate extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskTag = taskTagPersistService.save( Wi.copier.copy( wi ), effectivePerson );
 				
@@ -99,7 +99,7 @@ public class ActionCreate extends BaseAction {
 			}			
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamic = dynamicPersistService.taskTagCreateDynamic(taskTag, effectivePerson);
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionDelete.java

@@ -37,7 +37,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskTag = taskTagQueryService.get(taskTagId);
 				if ( taskTag == null) {
@@ -53,7 +53,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskTagPersistService.delete( taskTagId, effectivePerson );				
 				// 更新缓存
@@ -69,7 +69,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}		
 				
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamic = dynamicPersistService.taskTagDeleteDynamic( taskTag, effectivePerson );	
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionGet.java

@@ -43,7 +43,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskTag = taskTagQueryService.get(id);
 					if ( taskTag == null) {
@@ -59,7 +59,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( taskTag );
 					taskTagCache.put(new Element(cacheKey, wo));

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionListWithProject.java

@@ -31,7 +31,7 @@ public class ActionListWithProject extends BaseAction {
 		String cacheKey = null;
 		Element element = null;
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithProject", effectivePerson.getDistinguishedName(), project );
 			element = taskTagCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionListWithTask.java

@@ -41,7 +41,7 @@ public class ActionListWithTask extends BaseAction {
 			result.error( exception );
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( taskId );
 				if ( task == null) {
@@ -57,7 +57,7 @@ public class ActionListWithTask extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListWithTask", effectivePerson.getDistinguishedName(), taskId );
 			element = taskTagCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/tasktag/ActionRemoveTagRele.java

@@ -33,14 +33,14 @@ public class ActionRemoveTagRele extends BaseAction {
 		Dynamic dynamic = null;
 		
 		Wo wo = new Wo();
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( taskId )) {
 				check = false;
 				Exception exception = new TaskIdEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( tagId )) {
 				check = false;
 				Exception exception = new TagIdEmptyException();
@@ -48,7 +48,7 @@ public class ActionRemoveTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskTag = taskTagQueryService.get( tagId );
 				if ( taskTag == null) {
@@ -64,7 +64,7 @@ public class ActionRemoveTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				task = taskQueryService.get( taskId );
 				if ( task == null) {
@@ -80,7 +80,7 @@ public class ActionRemoveTagRele extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				
 				List<String> ids = taskTagPersistService.removeTagRele( taskId, tagId, effectivePerson);
@@ -99,7 +99,7 @@ public class ActionRemoveTagRele extends BaseAction {
 			}			
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {					
 				dynamic = dynamicPersistService.removeTaskTagReleDynamic( task, taskTag, effectivePerson );
 				if( dynamic != null ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionDelete.java

@@ -32,7 +32,7 @@ public class ActionDelete extends BaseAction {
 			result.error( exception );
 		}
 
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskView = taskViewQueryService.get(taskViewId);
 				if ( taskView == null) {
@@ -48,7 +48,7 @@ public class ActionDelete extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskViewPersistService.delete( taskViewId, effectivePerson );
 				

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionExecuteWithFilterInPage.java

@@ -40,7 +40,7 @@ public class ActionExecuteWithFilterInPage extends BaseAction {
 		QueryFilter  queryFilter = null;
 		List<TaskTag> tags = null;
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskView = taskViewQueryService.get( viewId );
 				if ( taskView == null) {
@@ -65,11 +65,11 @@ public class ActionExecuteWithFilterInPage extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter(taskView);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( ListTools.isNotEmpty( taskView.getChooseWorkTag() )) {
 				//获取在该项目中符合标签条件的所有工作任务ID
 				List<String> taskIds = taskTagQueryService.listTaskIdsWithTagIds( taskView.getChooseWorkTag() );
@@ -81,7 +81,7 @@ public class ActionExecuteWithFilterInPage extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionExecuteWithFilterInPage", effectivePerson.getDistinguishedName(), 
 					pageNum, pageSize, taskView.getOrderField(), taskView.getOrderType(), queryFilter.getContentSHA1() );
 			element = taskViewCache.get( cacheKey );

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionExecuteWithFilterNext.java

@@ -40,7 +40,7 @@ public class ActionExecuteWithFilterNext extends BaseAction {
 		QueryFilter  queryFilter = null;
 		List<TaskTag> tags = null;
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskView = taskViewQueryService.get( viewId );
 				if ( taskView == null) {
@@ -65,11 +65,11 @@ public class ActionExecuteWithFilterNext extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter(taskView);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( ListTools.isNotEmpty( taskView.getChooseWorkTag() )) {
 				//获取在该项目中符合标签条件的所有工作任务ID				
 				List<String> taskIds = taskTagQueryService.listTaskIdsWithTagIds( taskView.getChooseWorkTag() );
@@ -81,7 +81,7 @@ public class ActionExecuteWithFilterNext extends BaseAction {
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionExecuteWithFilterNext", effectivePerson.getDistinguishedName(),  flag, count, taskView.getOrderField(), taskView.getOrderType(), queryFilter.getContentSHA1() );
 			element = taskViewCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionGet.java

@@ -43,7 +43,7 @@ public class ActionGet extends BaseAction {
 			wo = (Wo) element.getObjectValue();
 			result.setData( wo );
 		} else {
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					taskView = taskViewQueryService.get(id);
 					if ( taskView == null) {
@@ -59,7 +59,7 @@ public class ActionGet extends BaseAction {
 				}
 			}
 			
-			if (check) {
+			if( Boolean.TRUE.equals( check ) ){
 				try {
 					wo = Wo.copier.copy( taskView );
 					taskViewCache.put(new Element(cacheKey, wo));

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionListMyTaskView.java

@@ -38,7 +38,7 @@ public class ActionListMyTaskView extends BaseAction {
 			result.error(exception);
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListMyTaskView", projectId, effectivePerson.getDistinguishedName(), effectivePerson.isManager() );
 			element = taskViewCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionListNextWithFilter.java

@@ -50,14 +50,14 @@ public class ActionListNextWithFilter extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			queryFilter = wrapIn.getQueryFilter();
 			if( StringUtils.isEmpty( wrapIn.getOwner() )) {
 				queryFilter.addEqualsTerm(  new EqualsTerm("owner", effectivePerson.getDistinguishedName() ) );
 			}
 		}
 		
-		if( check ) {
+		if( Boolean.TRUE.equals( check ) ){
 			cacheKey = ApplicationCache.concreteCacheKey( "ActionListNextWithFilter", effectivePerson.getDistinguishedName(),   flag, count,  wrapIn.getOrderField(), wrapIn.getOrderType(), queryFilter.getContentSHA1() );
 			element = taskViewCache.get( cacheKey );
 			

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/taskview/ActionSave.java

@@ -42,21 +42,21 @@ public class ActionSave extends BaseAction {
 			logger.error(e, effectivePerson, request, null);
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getProject() )) {
 				check = false;
 				Exception exception = new ProjectIdEmptyException();
 				result.error(exception);
 			}
 		}		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getName())) {
 				check = false;
 				Exception exception = new TaskViewNameEmptyException();
 				result.error(exception);
 			}
 		}
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			if( StringUtils.isEmpty( wi.getProject() )) {
 				check = false;
 				Exception exception = new ProjectIdEmptyException();
@@ -64,7 +64,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				project = projectQueryService.get( wi.getProject() );
 				if ( project == null) {
@@ -80,7 +80,7 @@ public class ActionSave extends BaseAction {
 			}
 		}
 		
-		if (check) {
+		if( Boolean.TRUE.equals( check ) ){
 			try {
 				taskView = taskViewPersistService.save( Wi.copier.copy( wi ), effectivePerson );
 				

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/MessageFactory.java

@@ -22,11 +22,18 @@ public class MessageFactory {
 		MessageConnector.send( MessageConnector.TYPE_TEAMWORK_TASKCREATE, title, task.getExecutor(),	task );
 	}
 	
-	public static void message_to_teamWorkUpdate( Task  task ) throws Exception {
+	public static void message_to_teamWorkUpdate( Task oldTask, Task newTask ) throws Exception {
 		//System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>message for teamwork update!" + task.getExecutor() );
-		String title = "工作任务信息变更:" + adjustTitle( task );
+		String title = "工作任务信息变更:" + adjustTitle( oldTask );
+		if( newTask != null && StringUtils.equals( newTask.getExecutor(), oldTask.getExecutor() )){
+			title = "工作任务负责人变更通知:" + adjustTitle( oldTask );
+		}
 		title = StringTools.utf8SubString( title, JpaObject.length_255B );
-		MessageConnector.send( MessageConnector.TYPE_TEAMWORK_TASKUPDATE, title, task.getExecutor(),	task );
+		MessageConnector.send( MessageConnector.TYPE_TEAMWORK_TASKUPDATE, title, oldTask.getExecutor(),	oldTask );
+		if( newTask != null ){
+			title = "工作任务负责人变更通知:" + adjustTitle( newTask );
+			MessageConnector.send( MessageConnector.TYPE_TEAMWORK_TASKUPDATE, title, newTask.getExecutor(),	newTask );
+		}
 	}
 	
 	public static void message_to_teamWorkUpdateParticipants( Task  task, List<String> participants ) throws Exception {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/TaskListPersistService.java

@@ -233,7 +233,7 @@ public class TaskListPersistService {
 		Business business = new Business( emc );
 		//查询当前任务在当前列表里的关联信息
 		List<TaskListRele> reles = business.taskListFactory().listReleWithTaskAndList( taskId, listId );
-		Integer  maxOrder = business.taskListFactory().maxOrder( listId );
+		Integer  maxOrder = business.taskListFactory().maxTaskOrder( listId );
 		if( ListTools.isNotEmpty( reles) && reles.get(0).getOrder() == newOrder ) {//排序号未改变
 			return;
 		}
@@ -299,7 +299,7 @@ public class TaskListPersistService {
 		
 		if( StringUtils.isEmpty( behindTaskId ) ) {
 			//未设置后序任务ID，放到最后一个，不需要插入到列表中间，不改变其他任务的序号
-			Integer  maxOrder = business.taskListFactory().maxOrder( listId );
+			Integer  maxOrder = business.taskListFactory().maxTaskOrder( listId );
 			if( ListTools.isNotEmpty( reles )) {
 				emc.beginTransaction( TaskListRele.class );
 				for( TaskListRele rele : reles ) {

o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/service/TaskListService.java

@@ -133,7 +133,7 @@ class TaskListService {
 		}
 		
 		taskList = emc.find( object.getId(), TaskList.class );
-		
+		Business business = new Business(emc);
 		emc.beginTransaction( TaskList.class );		
 		if( taskList == null ){ // 保存一个新的对象
 			TaskGroup taskGroup = emc.find( object.getTaskGroup(), TaskGroup.class );
@@ -146,7 +146,11 @@ class TaskListService {
 			object.copyTo( taskList );
 			if( StringUtils.isNotEmpty( object.getId() ) ){
 				taskList.setId( object.getId() );
-			}			
+			}
+
+			//查询最大的排序号
+			Integer maxListOrder = business.taskListFactory().maxListOrder( taskGroup.getId() ) + 1;
+			taskList.setOrder( maxListOrder );
 			emc.persist( taskList, CheckPersistType.all);
 		}else{ //对象已经存在，更新对象信息
 			TaskGroup taskGroup = emc.find( taskList.getTaskGroup(), TaskGroup.class );