修改一些empty判断的写法，以及修改一些注释内容，无代码逻辑修改

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/date/DateOperation.java

@@ -7,15 +7,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-/**
- * 
- * @项目名 ：SuperviseEfficientSystem
- * @包  名 ：com.land.util.date
- * @文件名 ：DateUtil.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术有限公司
- * @日  期 ：2013-06-07
- */
+
 public class DateOperation {
 	/**
 	 * 根据样式得到格式化对象SimpleDateFormat

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/common/excel/reader/Excel2003Reader.java

@@ -32,7 +32,6 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 /**
  * 抽象Excel2003读取器，通过实现HSSFListener监听器，采用事件驱动模式解析excel2003
  * 中的内容，遇到特定事件才会触发，大大减少了内存的使用。
- *
  */
 public  class Excel2003Reader implements HSSFListener{
 	private int minColumns = -1;

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/CacheUtil.java

@@ -5,7 +5,6 @@ import com.x.base.core.project.cache.ApplicationCache;
 
 /**
  * 缓存管理帮助类
- * @author liyi
  *
  */
 public class CacheUtil {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/DingdingPersonStatisticQueue.java

@@ -57,7 +57,7 @@ public class DingdingPersonStatisticQueue extends AbstractQueue<Date> {
                     List<String> ids = business.dingdingAttendanceFactory()
                             .getStatPersonForMonthIds(year, month, person.getDistinguishedName());
                     emc.beginTransaction(StatisticDingdingPersonForMonth.class);
-                    if (ids != null && ids.size() > 0) {
+                    if ( ListTools.isNotEmpty( ids ) ) {
                         for (String item : ids) {
                             StatisticDingdingPersonForMonth personForMonth_temp = emc.find(item, StatisticDingdingPersonForMonth.class);
                             emc.remove(personForMonth_temp);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/DingdingUnitStatisticQueue.java

@@ -9,6 +9,7 @@ import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.queue.AbstractQueue;
 import com.x.base.core.project.tools.DateTools;
+import com.x.base.core.project.tools.ListTools;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Date;
@@ -52,7 +53,7 @@ public class DingdingUnitStatisticQueue extends AbstractQueue<Date> {
                 }
                 List<String> ids = business.dingdingAttendanceFactory().getStatUnitForDayIds(year, month, day, unit);
                 emc.beginTransaction(StatisticDingdingUnitForDay.class);
-                if (ids != null && ids.size() > 0) {
+                if ( ListTools.isNotEmpty( ids ) ) {
                     for (String item : ids) {
                         StatisticDingdingUnitForDay statisticTopUnitForDay_tmp = emc.find(item, StatisticDingdingUnitForDay.class);
                         emc.remove(statisticTopUnitForDay_tmp);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/QywxPersonStatisticQueue.java

@@ -57,7 +57,7 @@ public class QywxPersonStatisticQueue extends AbstractQueue<Date> {
                     List<String> ids = business.dingdingAttendanceFactory()
                             .getQywxStatPersonForMonthIds(year, month, person.getDistinguishedName());
                     emc.beginTransaction(StatisticQywxPersonForMonth.class);
-                    if (ids != null && ids.size() > 0) {
+                    if ( ListTools.isNotEmpty( ids ) ) {
                         for (String item : ids) {
                             StatisticQywxPersonForMonth personForMonth_temp = emc.find(item, StatisticQywxPersonForMonth.class);
                             emc.remove(personForMonth_temp);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceDetailFactory.java

@@ -25,7 +25,6 @@ import com.x.base.core.project.exception.ExceptionWhen;
 import com.x.base.core.project.tools.ListTools;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceDetailFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceDetailMobileFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.attendance.entity.AttendanceDetailMobile_;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceDetailMobileFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceDetailStatisticFactory.java

@@ -17,7 +17,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 打卡信息统计服务类，以打卡信息表为基础进行统计
- * @author liyi
  */
 public class AttendanceDetailStatisticFactory extends AbstractFactory {
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceEmployeeConfigFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceEmployeeConfig_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 员工考勤需求配置服务器
- * @author liyi
  */
 public class AttendanceEmployeeConfigFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceImportFileInfoFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceImportFileInfo_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceImportFileInfoFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceScheduleSettingFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceScheduleSetting_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceScheduleSettingFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceSelfHolidayFactory.java

@@ -19,7 +19,6 @@ import java.util.Date;
 import java.util.List;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceSelfHolidayFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceSettingFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceSetting_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceSettingFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceStatisticRequireLogFactory.java

@@ -18,7 +18,6 @@ import com.x.attendance.entity.AttendanceStatisticRequireLog_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 员工考勤需求配置服务器
- * @author liyi
  */
 public class AttendanceStatisticRequireLogFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceStatisticalCycleFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceStatisticalCycle_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceStatisticalCycleFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceWorkDayConfigFactory.java

@@ -19,7 +19,6 @@ import com.x.base.core.project.exception.ExceptionWhen;
 
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceWorkDayConfigFactory extends AbstractFactory {
 

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/AttendanceJaxrsFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.ManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * @author liyi *
  */
 @WebFilter(urlPatterns = {
 		"/jaxrs/workplace/*",

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/AttendanceSimpleJaxrsFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * @author liyi *
  */
 @WebFilter(urlPatterns = { 
 		"/jaxrs/selfholidaysimple/*"

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportAbnormalDetail.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.x.base.core.project.tools.ListTools;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -24,9 +25,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
- *
  */
 public class ActionExportAbnormalDetail extends BaseAction {
 	
@@ -90,7 +88,7 @@ public class ActionExportAbnormalDetail extends BaseAction {
 		
 		Workbook wb = new HSSFWorkbook();
 		Row row = null;
-		if (detailList != null && detailList.size() > 0) {
+		if (ListTools.isNotEmpty(detailList) ) {
 			// 创建新的表格
 			Sheet sheet = wb.createSheet(sheetName);
 			

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportHolidayDetail.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.tools.ListTools;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
  *
  */
 public class ActionExportHolidayDetail extends BaseAction {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileDownload.java

@@ -9,8 +9,6 @@ import com.x.base.core.project.jaxrs.WoFile;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
  *
  */
 public class ActionImportFileDownload extends BaseAction {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendanceadmin/ActionSave.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.x.base.core.project.organization.Person;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -65,6 +66,43 @@ public class ActionSave extends BaseAction {
 				logger.error(e, currentPerson, request, null);
 			}
 		}
+		if (check) {
+			//如果adminName为空，根据标识核实admin姓名
+			if( StringUtils.isNotEmpty( attendanceAdmin.getAdmin()) ){
+				Person person = null;
+				try {
+					person = userManagerService.getPersonObjByName(attendanceAdmin.getAdminName());
+				} catch (Exception e) {
+					check = false;
+					Exception exception = new ExceptionAttendanceAdminProcess(e, "系统根据人员标识获取人员信息对象时发生异常.Flag="+attendanceAdmin.getAdmin());
+					result.error(exception);
+					logger.error(e, currentPerson, request, null);
+				}
+				if( person != null ){
+					attendanceAdmin.setAdminName( person.getName() );
+				}
+			}
+		}
+		if (check) {
+			//如果admin为空，根据姓名获取admin标识
+			if( StringUtils.isNotEmpty( attendanceAdmin.getAdminName()) ){
+				if( StringUtils.isEmpty( attendanceAdmin.getAdmin()) ){
+					Person person = null;
+					try {
+						person = userManagerService.getPersonObjByName(attendanceAdmin.getAdminName());
+					} catch (Exception e) {
+						check = false;
+						Exception exception = new ExceptionAttendanceAdminProcess(e, "系统根据人员姓名获取人员标识时发生异常.Name=" + attendanceAdmin.getAdminName() );
+						result.error(exception);
+						logger.error(e, currentPerson, request, null);
+					}
+					if( person != null ){
+						attendanceAdmin.setAdmin( person.getDistinguishedName() );
+					}
+				}
+			}
+		}
+
 		if (check) {
 			try {
 				attendanceAdmin = attendanceAdminServiceAdv.save(attendanceAdmin);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancestatisticalcycle/ActionSave.java

@@ -20,6 +20,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class ActionSave extends BaseAction {
 
@@ -58,7 +59,7 @@ public class ActionSave extends BaseAction {
 				ids = business.getAttendanceStatisticalCycleFactory().listByParameter(wrapIn.getTopUnitName(),
 						wrapIn.getUnitName(), wrapIn.getCycleYear(), wrapIn.getCycleMonth());
 				emc.beginTransaction(AttendanceStatisticalCycle.class);
-				if (ids != null && ids.size() > 0) {
+				if ( ListTools.isNotEmpty(ids) ) {
 					// 说明有重复的
 					_attendanceStatisticalCycle = emc.find(wrapIn.getId(), AttendanceStatisticalCycle.class);
 					if (_attendanceStatisticalCycle != null) {
@@ -72,7 +73,7 @@ public class ActionSave extends BaseAction {
 					}
 				} else {
 					// 新增就行了
-					if (wrapIn.getId() != null && wrapIn.getId().length() > 10) {
+					if ( wrapIn.getId() != null && wrapIn.getId().length() > 10 ) {
 						attendanceStatisticalCycle.setId(wrapIn.getId());
 					}
 					Wi.copier.copy(wrapIn, attendanceStatisticalCycle);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/fileimport/ActionImportDateInFile.java

@@ -20,6 +20,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class ActionImportDateInFile extends BaseAction {
 	
@@ -50,7 +51,7 @@ public class ActionImportDateInFile extends BaseAction {
 				logger.info("查询结果" + ids.size() + "条！");
 				logger.info("开始事务，删除batchName = " + file_id + "的" + ids.size() + "条数据记录......");
 				emc.beginTransaction(AttendanceDetail.class);
-				if (ids != null && ids.size() > 0) {
+				if (ListTools.isNotEmpty( ids )) {
 					for (String id : ids) {
 						_attendanceDetail = emc.find(id, AttendanceDetail.class);
 						emc.remove(_attendanceDetail);
@@ -67,7 +68,7 @@ public class ActionImportDateInFile extends BaseAction {
 				for ( EntityImportDataDetail cacheImportRowDetail : cacheImportFileStatus.getDetailList() ) {
 					logger.info("查询数据库里是否有重复记录：姓名：" + cacheImportRowDetail.getEmployeeName() + "， 日期：" + cacheImportRowDetail.getRecordDateStringFormated());
 					ids = business.getAttendanceDetailFactory().getByUserAndRecordDate( cacheImportRowDetail.getEmployeeName(), cacheImportRowDetail.getRecordDateStringFormated() );
-					if (ids != null && ids.size() > 0) {
+					if (ListTools.isNotEmpty( ids )) {
 						for (String id : ids) {
 							logger.info("查询数据库里是否有重复记录：id=" + id);
 							attendanceDetail = emc.find(id, AttendanceDetail.class);

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDelete.java

@@ -17,6 +17,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class ActionDelete extends BaseAction {
 	
@@ -40,7 +41,7 @@ public class ActionDelete extends BaseAction {
 				result.setData( new Wo(id) );
 				//根据员工休假数据来记录与这条数据相关的统计需求记录
 				List<String> ids = attendanceDetailAnalyseServiceAdv.getAnalyseAttendanceDetailIds( attendanceSelfHoliday.getEmployeeName(), attendanceSelfHoliday.getStartTime(), attendanceSelfHoliday.getEndTime() );
-				if( ids != null && ids.size() > 0 ){
+				if( ListTools.isNotEmpty( ids ) ){
 					try {//查询所有的周期配置，组织成Map
 						topUnitAttendanceStatisticalCycleMap = attendanceStatisticCycleServiceAdv.getCycleMapFormAllCycles( effectivePerson.getDebugger() );
 					} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionDeleteByWfDocId.java

@@ -17,6 +17,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class ActionDeleteByWfDocId extends BaseAction {
 	
@@ -37,7 +38,7 @@ public class ActionDeleteByWfDocId extends BaseAction {
 			business = new Business(emc);
 			// 先判断需要操作的应用信息是否存在，根据ID进行一次查询，如果不存在不允许继续操作
 			ids = business.getAttendanceSelfHolidayFactory().getByWorkFlowDocId(wfDocId);
-			if (ids != null && ids.size() > 0) {
+			if ( ListTools.isNotEmpty( ids ) ) {
 				attendanceSelfHolidays = business.getAttendanceSelfHolidayFactory().list(ids);
 				if (attendanceSelfHolidays != null && attendanceSelfHolidays.size() > 0) {
 					for (AttendanceSelfHoliday attendanceSelfHoliday : attendanceSelfHolidays) {
@@ -51,7 +52,7 @@ public class ActionDeleteByWfDocId extends BaseAction {
 						ids = attendanceDetailAnalyseServiceAdv.getAnalyseAttendanceDetailIds(
 								attendanceSelfHoliday.getEmployeeName(), attendanceSelfHoliday.getStartTime(),
 								attendanceSelfHoliday.getEndTime());
-						if (ids != null && ids.size() > 0) {
+						if ( ListTools.isNotEmpty( ids ) ) {
 							try {// 查询所有的周期配置，组织成Map
 								topUnitAttendanceStatisticalCycleMap = attendanceStatisticCycleServiceAdv.getCycleMapFormAllCycles( effectivePerson.getDebugger() );
 							} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/selfholiday/ActionSave.java

@@ -105,7 +105,7 @@ public class ActionSave extends BaseAction {
 					logger.info("++++++++休假数据有变动，对该员工的该请假时间内的所有打卡记录进行分析......" );
 					//休假数据有更新，对该员工的该请假时间内的所有打卡记录进行分析
 					List<String> ids = attendanceDetailAnalyseServiceAdv.getAnalyseAttendanceDetailIds( attendanceSelfHoliday.getEmployeeName(), attendanceSelfHoliday.getStartTime(), attendanceSelfHoliday.getEndTime() );
-					if( ids != null && ids.size() > 0 ){
+					if( ListTools.isNotEmpty( ids ) ){
 						try {//查询所有的周期配置，组织成Map
 							topUnitAttendanceStatisticalCycleMap = attendanceStatisticCycleServiceAdv.getCycleMapFormAllCycles( effectivePerson.getDebugger() );
 						} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/uuid/UUIDAction.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 该类旨在提供一个服务创建唯一的UNID
- * 
- * @author liyi
  *
  */
 @Path("uuid")

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/workplace/ActionListAll.java

@@ -14,6 +14,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class ActionListAll extends BaseAction {
 	
@@ -36,7 +37,7 @@ public class ActionListAll extends BaseAction {
 			}
 		}
 		if (check) {
-			if (attendanceWorkPlaceList != null && !attendanceWorkPlaceList.isEmpty()) {
+			if ( ListTools.isNotEmpty(attendanceWorkPlaceList) ) {
 				try {
 					wraps = Wo.copier.copy(attendanceWorkPlaceList);
 				} catch (Exception e) {

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceStatisticService.java

@@ -21,6 +21,7 @@ import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckPersistType;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 
 public class AttendanceStatisticService {
 	
@@ -204,12 +205,11 @@ public class AttendanceStatisticService {
 			throw e;
 		}
 	}
-	
+
 	/**
 	 * 根据数据统计需求，进行组织每月考勤分析结果统计
 	 * @param emc
 	 * @param attendanceStatisticRequireLog
-	 * @param attendanceStatisticalCycle
 	 * @param workDayConfigList
 	 * @param topUnitAttendanceStatisticalCycleMap
 	 */
@@ -292,7 +292,7 @@ public class AttendanceStatisticService {
 			//查询该组织该年份月份的统计是否存在，如果存在则删除
 			ids = business.getStatisticUnitForMonthFactory().listByUnitYearAndMonth( unitName, cycleYear, cycleMonth );
 			emc.beginTransaction(StatisticUnitForMonth.class);
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticUnitForMonth_tmp = emc.find( id, StatisticUnitForMonth.class );
 					emc.remove( statisticUnitForMonth_tmp );
@@ -414,7 +414,7 @@ public class AttendanceStatisticService {
 			//查询该组织该年份月份的统计是否存在，如果存在则删除
 			ids = business.getStatisticTopUnitForMonthFactory().listByTopUnitYearAndMonth( topUnitName, cycleYear, cycleMonth );
 			emc.beginTransaction( StatisticTopUnitForMonth.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticTopUnitForMonth_tmp = emc.find(id, StatisticTopUnitForMonth.class);
 					emc.remove( statisticTopUnitForMonth_tmp );
@@ -533,7 +533,7 @@ public class AttendanceStatisticService {
 			//查询该组织当天的统计是否存在，如果存在则删除
 			ids = business.getStatisticUnitForDayFactory().listByUnitDayDate( unitName, statisticDate );
 			emc.beginTransaction( StatisticUnitForDay.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					logger.debug( debugger, ">>>>>>>>>>删除已存在的数据，id=" + id);
 					statisticUnitForDay_tmp = emc.find(id, StatisticUnitForDay.class);
@@ -644,7 +644,7 @@ public class AttendanceStatisticService {
 			//查询该顶层组织当天的统计是否存在，如果存在则删除
 			ids = business.getStatisticTopUnitForDayFactory().listByTopUnitRecordDateString( topUnitName, statisticDate );
 			emc.beginTransaction( StatisticTopUnitForDay.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticTopUnitForDay_tmp = emc.find(id, StatisticTopUnitForDay.class);
 					emc.remove( statisticTopUnitForDay_tmp );

o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/UserManagerService.java

@@ -259,6 +259,25 @@ public class UserManagerService {
 		}
 	}
 
+	/**
+	 * 根据人员姓名获取人员姓名
+	 * @param name
+	 * @return
+	 * @throws Exception
+	 */
+	public Person getPersonObjByName( String name ) throws Exception {
+		if( StringUtils.isEmpty( name ) ){
+			throw new Exception( "identityName is null!" );
+		}
+		Business business = null;
+		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
+			business = new Business(emc);
+			return business.organization().person().getObject(name);
+		} catch ( Exception e ) {
+			throw e;
+		}
+	}
+
 	/**
 	 * 根据人员身份信息获取人员姓名
 	 * @param identityName

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/common/date/DateOperation.java

@@ -7,15 +7,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-/**
- * 
- * @项目名 ：SuperviseEfficientSystem
- * @包  名 ：com.land.util.date
- * @文件名 ：DateUtil.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术有限公司
- * @日  期 ：2013-06-07
- */
+
 public class DateOperation {
 	/**
 	 * 根据样式得到格式化对象SimpleDateFormat

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/CacheUtil.java

@@ -5,7 +5,6 @@ import com.x.base.core.project.cache.ApplicationCache;
 
 /**
  * 缓存管理帮助类
- * @author liyi
  *
  */
 public class CacheUtil {

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceDetailFactory.java

@@ -25,7 +25,6 @@ import com.x.base.core.project.exception.ExceptionWhen;
 import com.x.base.core.project.tools.ListTools;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceDetailFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceDetailMobileFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceDetailMobile;
 import com.x.attendance.entity.AttendanceDetailMobile_;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceDetailMobileFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceDetailStatisticFactory.java

@@ -17,7 +17,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 打卡信息统计服务类，以打卡信息表为基础进行统计
- * @author liyi
  */
 public class AttendanceDetailStatisticFactory extends AbstractFactory {
 

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceEmployeeConfigFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceEmployeeConfig_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 员工考勤需求配置服务器
- * @author liyi
  */
 public class AttendanceEmployeeConfigFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceImportFileInfoFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceImportFileInfo_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceImportFileInfoFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceScheduleSettingFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceScheduleSetting_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceScheduleSettingFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceSelfHolidayFactory.java

@@ -19,7 +19,6 @@ import java.util.Date;
 import java.util.List;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceSelfHolidayFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceSettingFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceSetting_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceSettingFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceStatisticRequireLogFactory.java

@@ -18,7 +18,6 @@ import com.x.attendance.entity.AttendanceStatisticRequireLog_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 员工考勤需求配置服务器
- * @author liyi
  */
 public class AttendanceStatisticRequireLogFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceStatisticalCycleFactory.java

@@ -16,7 +16,6 @@ import com.x.attendance.entity.AttendanceStatisticalCycle_;
 import com.x.base.core.project.exception.ExceptionWhen;
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceStatisticalCycleFactory extends AbstractFactory {
 	

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/factory/AttendanceWorkDayConfigFactory.java

@@ -19,7 +19,6 @@ import com.x.base.core.project.exception.ExceptionWhen;
 
 /**
  * 系统配置信息表基础功能服务类
- * @author liyi
  */
 public class AttendanceWorkDayConfigFactory extends AbstractFactory {
 

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/AttendanceJaxrsFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.ManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * @author liyi *
  */
 @WebFilter(urlPatterns = {
 		"/jaxrs/workplace/*",

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/AttendanceSimpleJaxrsFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * @author liyi *
  */
 @WebFilter(urlPatterns = { 
 		"/jaxrs/selfholidaysimple/*"

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportAbnormalDetail.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
  *
  */
 public class ActionExportAbnormalDetail extends BaseAction {

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportHolidayDetail.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.tools.ListTools;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
  *
  */
 public class ActionExportHolidayDetail extends BaseAction {

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/attachment/ActionImportFileDownload.java

@@ -9,8 +9,6 @@ import com.x.base.core.project.jaxrs.WoFile;
 
 /**
  * 导入的文件没有用到文件存储器，是直接放在数据库中的BLOB列
- * 
- * @author liyi
  *
  */
 public class ActionImportFileDownload extends BaseAction {

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/jaxrs/uuid/UUIDAction.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 该类旨在提供一个服务创建唯一的UNID
- * 
- * @author liyi
  *
  */
 @Path("uuid")

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/processor/sender/SenderForAnalyseData.java

@@ -32,7 +32,7 @@ public class SenderForAnalyseData {
 		for ( String personName : personNames ) {
 			try {
 				ids = attendanceDetailServiceAdv.getAllAnalysenessDetails( startDate, endDate, personName );
-				if( ids != null && !ids.isEmpty() ) {
+				if( ListTools.isNotEmpty(ids) ) {
 					statusSystemImportOpt.setProcessing( true );
 					statusSystemImportOpt.setProcessing_analysis( true );
 					statusSystemImportOpt.increaseProcess_analysis_total( ids.size() );

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/processor/sender/SenderForSaveData.java

@@ -34,7 +34,7 @@ public class SenderForSaveData {
 			// 先删除这一个文件ID下的所有记录
 			List<String> ids = business.getAttendanceDetailFactory().listByBatchName( file_id );
 			emc.beginTransaction(AttendanceDetail.class);
-			if (ids != null && ids.size() > 0) {
+			if ( ListTools.isNotEmpty(ids) ) {
 				for (String id : ids) {
 					detail = emc.find(id, AttendanceDetail.class);
 					emc.remove( detail );

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/processor/thread/OperatorDataAnalyse.java

@@ -56,10 +56,10 @@ public class OperatorDataAnalyse implements Runnable{
 		statusSystemImportOpt.setProcessing( true );
 		statusSystemImportOpt.setProcessing_analysis( true );
 		
-		if ( detail_ids != null && !detail_ids.isEmpty() ) {
+		if ( ListTools.isNotEmpty( detail_ids )) {
 			try{
 				ids_temp = attendanceSelfHolidayServiceAdv.getByPersonName( entityAnalyseData.getPersonName() );
-				if( ids_temp != null && !ids_temp.isEmpty() ) {
+				if( ListTools.isNotEmpty( ids_temp ) ) {
 					selfHolidays = attendanceSelfHolidayServiceAdv.list( ids_temp );
 				}
 			}catch( Exception e ){

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/processor/thread/OperatorDataValidator.java

@@ -38,7 +38,7 @@ public class OperatorDataValidator implements Runnable {
 		if( colmlist == null ) {
 			return;
 		}
-		if( colmlist != null && !colmlist.get(0).isEmpty() && !colmlist.get(2).isEmpty()){
+		if( ListTools.isNotEmpty( colmlist ) && !colmlist.get(0).isEmpty() && !colmlist.get(2).isEmpty()){
 			try {
 				check( cacheImportRowDetail.getFile_id(), curRow, colmlist );
 			}catch( Exception e ) {
@@ -57,7 +57,7 @@ public class OperatorDataValidator implements Runnable {
 		
 		cacheImportFileStatus.setProcessing( true );
 		
-		if( colmlist!= null && colmlist.size() > 0 ){
+		if( ListTools.isNotEmpty( colmlist ) ){
 			
 			Boolean checkSuccess = true;
 			Boolean personExists = true;

o2server/x_attendance_assemble_control/src/main/webapp/describe/sources/com/x/attendance/assemble/control/service/AttendanceStatisticService.java

@@ -292,7 +292,7 @@ public class AttendanceStatisticService {
 			//查询该组织该年份月份的统计是否存在，如果存在则删除
 			ids = business.getStatisticUnitForMonthFactory().listByUnitYearAndMonth( unitName, cycleYear, cycleMonth );
 			emc.beginTransaction(StatisticUnitForMonth.class);
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticUnitForMonth_tmp = emc.find( id, StatisticUnitForMonth.class );
 					emc.remove( statisticUnitForMonth_tmp );
@@ -414,7 +414,7 @@ public class AttendanceStatisticService {
 			//查询该组织该年份月份的统计是否存在，如果存在则删除
 			ids = business.getStatisticTopUnitForMonthFactory().listByTopUnitYearAndMonth( topUnitName, cycleYear, cycleMonth );
 			emc.beginTransaction( StatisticTopUnitForMonth.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticTopUnitForMonth_tmp = emc.find(id, StatisticTopUnitForMonth.class);
 					emc.remove( statisticTopUnitForMonth_tmp );
@@ -533,7 +533,7 @@ public class AttendanceStatisticService {
 			//查询该组织当天的统计是否存在，如果存在则删除
 			ids = business.getStatisticUnitForDayFactory().listByUnitDayDate( unitName, statisticDate );
 			emc.beginTransaction( StatisticUnitForDay.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					logger.debug( debugger, ">>>>>>>>>>删除已存在的数据，id=" + id);
 					statisticUnitForDay_tmp = emc.find(id, StatisticUnitForDay.class);
@@ -644,7 +644,7 @@ public class AttendanceStatisticService {
 			//查询该顶层组织当天的统计是否存在，如果存在则删除
 			ids = business.getStatisticTopUnitForDayFactory().listByTopUnitRecordDateString( topUnitName, statisticDate );
 			emc.beginTransaction( StatisticTopUnitForDay.class );
-			if( ids != null && ids.size() > 0 ){
+			if( ListTools.isNotEmpty( ids ) ){
 				for( String id : ids ){
 					statisticTopUnitForDay_tmp = emc.find(id, StatisticTopUnitForDay.class);
 					emc.remove( statisticTopUnitForDay_tmp );

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceAdmin.java

@@ -77,6 +77,12 @@ public class AttendanceAdmin extends SliceJpaObject {
 	@CheckPersist(allowEmpty = false)
 	private String adminName = "";
 
+	public static final String admin_FIELDNAME = "admin";
+	@FieldDescribe("管理员标识")
+	@Column(length = JpaObject.length_96B, name = ColumnNamePrefix + adminName_FIELDNAME)
+	@Index(name = TABLE + IndexNameMiddle + adminName_FIELDNAME)
+	private String admin = "";
+
 	public static final String adminLevel_FIELDNAME = "adminLevel";
 	@FieldDescribe("管理级别:UNIT|TOPUNIT")
 	@Column(length = JpaObject.length_96B, name = ColumnNamePrefix + adminLevel_FIELDNAME)
@@ -114,4 +120,8 @@ public class AttendanceAdmin extends SliceJpaObject {
 	public void setAdminLevel(String adminLevel) {
 		this.adminLevel = adminLevel;
 	}
+
+	public String getAdmin() { return admin; }
+
+	public void setAdmin(String admin) { this.admin = admin; }
 }

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/AttendanceImportFileInfo.java

@@ -30,8 +30,6 @@ import com.x.base.core.project.tools.DateTools;
 
 /**
  * 内容管理应用目录分类信息
- * 
- * @author 李义
  *
  */
 @ContainerEntity

o2server/x_attendance_core_entity/src/main/java/com/x/attendance/entity/DateOperation.java

@@ -7,15 +7,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-/**
- * 
- * @项目名 ：SuperviseEfficientSystem
- * @包  名 ：com.land.util.date
- * @文件名 ：DateUtil.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术有限公司
- * @日  期 ：2013-06-07
- */
+
+
 public class DateOperation {
 	/**
 	 * 根据样式得到格式化对象SimpleDateFormat

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/common/date/DateOperation.java

@@ -10,15 +10,8 @@ import java.util.List;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 
-/**
- * 
- * @项目名 ：OKR
- * @包  名 ：com.x.okr.assemble.common.date
- * @文件名 ：DateOperation.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术股份有限公司
- * @日  期 ：2016-06-07
- */
+
+
 public class DateOperation {
 	
 	private static  Logger logger =  LoggerFactory.getLogger( DateOperation.class);

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSConfigSettingFactory.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import com.x.base.core.project.exception.ExceptionWhen;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.AbstractFactory;
 import com.x.bbs.assemble.control.Business;
 import com.x.bbs.entity.BBSConfigSetting;
@@ -69,7 +70,7 @@ public class BBSConfigSettingFactory extends AbstractFactory {
 		Predicate p = cb.equal( root.get( BBSConfigSetting_.configCode ), configCode );
 		cq.select(root.get(BBSConfigSetting_.configValue));
 		List<String> valueList = em.createQuery(cq.where(p)).getResultList();
-		if( valueList != null && valueList.size() > 0 ){
+		if( ListTools.isNotEmpty(valueList) ){
 			return valueList.get(0);
 		}
 		return null;
@@ -85,7 +86,7 @@ public class BBSConfigSettingFactory extends AbstractFactory {
 		Root<BBSConfigSetting> root = cq.from(BBSConfigSetting.class);
 		Predicate p = cb.equal( root.get( BBSConfigSetting_.configCode ), configCode );
 		List<BBSConfigSetting> valueList = em.createQuery(cq.where(p)).getResultList();
-		if( valueList != null && valueList.size() > 0 ){
+		if( ListTools.isNotEmpty(valueList) ){
 			return valueList.get(0);
 		}
 		return null;

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSForumInfoFactory.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import com.x.base.core.project.exception.ExceptionWhen;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.AbstractFactory;
 import com.x.bbs.assemble.control.Business;
 import com.x.bbs.entity.BBSForumInfo;
@@ -64,7 +65,7 @@ public class BBSForumInfoFactory extends AbstractFactory {
 		CriteriaQuery<BBSForumInfo> cq = cb.createQuery(BBSForumInfo.class);
 		Root<BBSForumInfo> root = cq.from(BBSForumInfo.class);
 		Predicate p = cb.equal( root.get( BBSForumInfo_.forumVisible ), "所有人" );
-		if( viewAbleForumIds != null && !viewAbleForumIds.isEmpty() ){
+		if( ListTools.isNotEmpty(viewAbleForumIds) ){
 			p = cb.or( p, root.get( BBSForumInfo_.id ).in( viewAbleForumIds ) );
 		}
 		cq.orderBy( cb.asc( root.get( BBSForumInfo_.orderNumber ) ) );

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSPermissionInfoFactory.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import com.x.base.core.project.exception.ExceptionWhen;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.AbstractFactory;
 import com.x.bbs.assemble.control.Business;
 import com.x.bbs.entity.BBSPermissionInfo;
@@ -66,7 +67,7 @@ public class BBSPermissionInfoFactory extends AbstractFactory {
 		Root<BBSPermissionInfo> root = cq.from(BBSPermissionInfo.class);
 		Predicate p = cb.equal( root.get(BBSPermissionInfo_.permissionCode), permissionCode );
 		permissionInfoList = em.createQuery(cq.where(p)).getResultList();
-		if( permissionInfoList != null && permissionInfoList.size() > 0 ){
+		if( ListTools.isNotEmpty(permissionInfoList) ){
 			return permissionInfoList.get(0);
 		}else{
 			return null;

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSPermissionRoleFactory.java

@@ -9,6 +9,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import com.x.base.core.project.tools.ListTools;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.exception.ExceptionWhen;
@@ -86,7 +87,7 @@ public class BBSPermissionRoleFactory extends AbstractFactory {
 		Predicate p = cb.equal( root.get( BBSPermissionRole_.roleCode ), roleCode );
 		p = cb.and( p, cb.equal( root.get( BBSPermissionRole_.permissionCode ), permissionCode ));
 		roleInfoList = em.createQuery( cq.where(p) ).getResultList();
-		if( roleInfoList != null && roleInfoList.size() > 0 ){
+		if( ListTools.isNotEmpty(roleInfoList) ){
 			return true;
 		}else{
 			return false;
@@ -109,7 +110,7 @@ public class BBSPermissionRoleFactory extends AbstractFactory {
 		Predicate p = cb.equal( root.get( BBSPermissionRole_.roleCode ), roleCode );
 		p = cb.and( p, cb.equal( root.get( BBSPermissionRole_.permissionCode ), permissionCode ));
 		roleInfoList = em.createQuery( cq.where(p) ).getResultList();
-		if( roleInfoList != null && roleInfoList.size() > 0 ){
+		if( ListTools.isNotEmpty(roleInfoList) ){
 			return roleInfoList.get( 0 );
 		}else{
 			return null;

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSRoleInfoFactory.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
 import com.x.base.core.project.exception.ExceptionWhen;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.AbstractFactory;
 import com.x.bbs.assemble.control.Business;
 import com.x.bbs.entity.BBSRoleInfo;
@@ -66,7 +67,7 @@ public class BBSRoleInfoFactory extends AbstractFactory {
 		Root<BBSRoleInfo> root = cq.from( BBSRoleInfo.class );
 		Predicate p = cb.equal( root.get( BBSRoleInfo_.roleCode ), roleCode );
 		roleInfoList = em.createQuery( cq.where(p) ).getResultList();
-		if( roleInfoList != null && roleInfoList.size() > 0 ){
+		if( ListTools.isNotEmpty(roleInfoList) ){
 			return roleInfoList.get(0);
 		}else{
 			return null;

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSSectionInfoFactory.java

@@ -15,6 +15,7 @@ import com.x.bbs.assemble.control.AbstractFactory;
 import com.x.bbs.assemble.control.Business;
 import com.x.bbs.entity.BBSSectionInfo;
 import com.x.bbs.entity.BBSSectionInfo_;
+import org.apache.commons.lang3.BooleanUtils;
 
 /**
  * 类   名：BBSSectionInfoFactory<br/>
@@ -254,7 +255,7 @@ public class BBSSectionInfoFactory extends AbstractFactory {
 		Root<BBSSectionInfo> root = cq.from(BBSSectionInfo.class);
 		Predicate p = root.get( BBSSectionInfo_.forumId ).in( viewforumIds );
 		p = cb.and(p, cb.equal( root.get( BBSSectionInfo_.sectionStatus ), "启用" ));
-		if( publicStatus != null && publicStatus ){
+		if( BooleanUtils.isTrue(publicStatus) ){
 			p = cb.and(p, cb.equal( root.get( BBSSectionInfo_.sectionVisible ), "所有人" ));
 		}
 		cq.select( root.get( BBSSectionInfo_.id ) );

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/factory/BBSSubjectInfoFactory.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.x.base.core.project.exception.ExceptionWhen;
@@ -278,7 +279,7 @@ public class BBSSubjectInfoFactory extends AbstractFactory {
 		if( StringUtils.isNotEmpty( sectionId ) ){
 			p = cb.and( p, cb.equal( root.get( BBSSubjectInfo_.sectionId ), sectionId));
 		}
-		if( needPicture != null && needPicture ){
+		if( BooleanUtils.isTrue(needPicture) ){
 			p = cb.and( p, cb.isNotNull( root.get( BBSSubjectInfo_.picId ) ),  cb.notEqual( root.get( BBSSubjectInfo_.picId ), ""));
 		}
 		if( StringUtils.isNotEmpty( creatorName ) ){
@@ -321,7 +322,7 @@ public class BBSSubjectInfoFactory extends AbstractFactory {
 		if( StringUtils.isNotEmpty( sectionId ) ){
 			p = cb.and( p, cb.equal( root.get( BBSSubjectInfo_.sectionId ), sectionId));
 		}
-		if( needPicture != null && needPicture ){
+		if( BooleanUtils.isTrue(needPicture) ){
 			p = cb.and( p, cb.isNotNull( root.get( BBSSubjectInfo_.picId ) ),  cb.notEqual( root.get( BBSSubjectInfo_.picId ), ""));
 		}
 		if( StringUtils.isNotEmpty( creatorName ) ){
@@ -426,7 +427,7 @@ public class BBSSubjectInfoFactory extends AbstractFactory {
 		if( StringUtils.isNotEmpty( sectionId ) ){
 			p = cb.and( p, cb.equal( root.get( BBSSubjectInfo_.sectionId ), sectionId));
 		}
-		if( needPicture != null && needPicture ){
+		if( BooleanUtils.isTrue(needPicture) ){
 			p = cb.and( p, cb.isNotNull( root.get( BBSSubjectInfo_.picId ) ),  cb.notEqual( root.get( BBSSubjectInfo_.picId ), ""));
 		}
 		if( StringUtils.isNotEmpty( searchTitle ) ){
@@ -465,7 +466,7 @@ public class BBSSubjectInfoFactory extends AbstractFactory {
 		if( StringUtils.isNotEmpty( sectionId ) ){
 			p = cb.and( p, cb.equal( root.get( BBSSubjectInfo_.sectionId ), sectionId));
 		}
-		if( needPicture != null && needPicture ){
+		if( BooleanUtils.isTrue(needPicture) ){
 			p = cb.and( p, cb.isNotNull( root.get( BBSSubjectInfo_.picId ) ),  cb.notEqual( root.get( BBSSubjectInfo_.picId ), ""));
 		}
 		if( StringUtils.isNotEmpty( searchTitle ) ){

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/BBSJaxrsFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，匿名用户可以访问的服务
- * @author liyi *
  */
 @WebFilter( urlPatterns = {
 		"/jaxrs/permission/*",

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/BBSJaxrsManagerUserFilter.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.jaxrs.ManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * @author liyi *
  */
 @WebFilter( urlPatterns = {
 		"/jaxrs/user/*",

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/roleinfo/ActionGet.java

@@ -12,6 +12,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.jaxrs.roleinfo.exception.ExceptionRoleInfoIdEmpty;
 import com.x.bbs.assemble.control.jaxrs.roleinfo.exception.ExceptionRoleInfoNotExists;
 import com.x.bbs.assemble.control.jaxrs.roleinfo.exception.ExceptionRoleInfoProcess;
@@ -69,7 +70,7 @@ public class ActionGet extends BaseAction {
 		}
 
 		if (check) {
-			if (permissionList != null && permissionList.size() > 0) {
+			if (ListTools.isNotEmpty(permissionList) ) {
 				try {
 					permissionWraps = WoPermissionInfo.copier.copy(permissionList);
 				} catch (Exception e) {

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/roleinfo/ActionGetAll.java

@@ -12,6 +12,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 import com.x.bbs.assemble.control.jaxrs.roleinfo.exception.ExceptionRoleInfoProcess;
 import com.x.bbs.entity.BBSPermissionInfo;
 import com.x.bbs.entity.BBSRoleInfo;
@@ -42,7 +43,7 @@ public class ActionGetAll extends BaseAction {
 		}
 
 		if (check) {
-			if (roleInfoList != null && roleInfoList.size() > 0) {
+			if ( ListTools.isNotEmpty(roleInfoList) ) {
 				try {
 					wraps = Wo.copier.copy(roleInfoList);
 					result.setData(wraps);

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/jaxrs/uuid/UUIDAction.java

@@ -25,9 +25,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 该类旨在提供一个服务创建唯一的UNID
- * 
- * @author liyi
- *
  */
 @Path("uuid")
 public class UUIDAction extends StandardJaxrsAction {

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/service/BBSSubjectInfoService.java

@@ -173,7 +173,7 @@ public class BBSSubjectInfoService {
 		//检查和绑定附件信息
 		//1、先查询所有的附件绑定信息
 		attachList = business.subjectAttachmentFactory().listBySubjectId( _bBSSubjectInfo.getId() );
-		if( attachList != null && attachList.size() > 0 ){
+		if( ListTools.isNotEmpty(attachList) ){
 			for( BBSSubjectAttachment attachment : attachList ){
 				exists = false;
 				if( _bBSSubjectInfo.getAttachmentList() != null && _bBSSubjectInfo.getAttachmentList().size() > 0 ){
@@ -358,17 +358,17 @@ public class BBSSubjectInfoService {
 			}
 			emc.remove( subjectInfo, CheckRemoveType.all );
 		}
-		if( voteOptionGroupList != null && voteOptionGroupList.size() > 0 ){
+		if( ListTools.isNotEmpty(voteOptionGroupList) ){
 			for( BBSVoteOptionGroup voteOptionGroup : voteOptionGroupList ){
 				emc.remove( voteOptionGroup, CheckRemoveType.all );
 			}
 		}
-		if( voteOptionList != null && voteOptionList.size() > 0 ){
+		if( ListTools.isNotEmpty(voteOptionList) ){
 			for( BBSVoteOption voteOption : voteOptionList ){
 				emc.remove( voteOption, CheckRemoveType.all );
 			}
 		}
-		if( voteRecordList != null && voteRecordList.size() > 0 ){
+		if( ListTools.isNotEmpty(voteRecordList) ){
 			for( BBSVoteRecord voteRecord : voteRecordList ){
 				emc.remove( voteRecord, CheckRemoveType.all );
 			}
@@ -993,7 +993,7 @@ public class BBSSubjectInfoService {
 		try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) {
 			business = new Business( emc );
 			encodeList = business.subjectInfoFactory().getSubjectContent( id );
-			if( encodeList != null && encodeList.size() > 0 ){
+			if( ListTools.isNotEmpty(encodeList) ){
 				subjectContent = encodeList.get( 0 );
 			}
 			if( subjectContent != null ){

o2server/x_bbs_assemble_control/src/main/java/com/x/bbs/assemble/control/service/BBSSubjectInfoServiceAdv.java

@@ -684,7 +684,7 @@ public class BBSSubjectInfoServiceAdv {
 		try ( EntityManagerContainer emc = EntityManagerContainerFactory.instance().create() ) {
 			business = new Business( emc );
 			encodeList = business.subjectInfoFactory().getSubjectContent( id );
-			if( encodeList != null && encodeList.size() > 0 ){
+			if( ListTools.isNotEmpty(encodeList) ){
 				subjectContent = encodeList.get( 0 );
 			}
 			if( subjectContent != null ){

o2server/x_bbs_core_entity/src/main/java/com/x/bbs/entity/BBSSubjectAttachment.java

@@ -28,9 +28,6 @@ import com.x.base.core.project.tools.DateTools;
 
 /**
  * 附件信息管理表
- * 
- * @author 李义
- *
  */
 @ContainerEntity
 @Entity

o2server/x_calendar_assemble_control/src/main/java/com/x/calendar/assemble/control/jaxrs/setting/ActionListAll.java

@@ -11,6 +11,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 import com.x.calendar.core.entity.Calendar_Setting;
 
 public class ActionListAll extends BaseAction {
@@ -37,7 +38,7 @@ public class ActionListAll extends BaseAction {
 		if( check ){
 			try {
 				wraps = Wo.copier.copy( report_S_SettingList );
-				if( wraps != null && !wraps.isEmpty() ) {
+				if( ListTools.isNotEmpty(wraps) ) {
 					for( Wo wo : wraps) {
 						if( wo.getIsLob() ) {
 							//查询LOB值

o2server/x_calendar_assemble_control/src/main/webapp/describe/sources/com/x/calendar/assemble/control/jaxrs/setting/ActionListAll.java

@@ -37,7 +37,7 @@ public class ActionListAll extends BaseAction {
 		if( check ){
 			try {
 				wraps = Wo.copier.copy( report_S_SettingList );
-				if( wraps != null && !wraps.isEmpty() ) {
+				if( ListTools.isNotEmpty(wraps) ) {
 					for( Wo wo : wraps) {
 						if( wo.getIsLob() ) {
 							//查询LOB值

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/tools/DateOperation.java

@@ -8,15 +8,7 @@ import java.util.Date;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 
-/**
- * 
- * @项目名 ：SuperviseEfficientSystem
- * @包  名 ：com.land.util.date
- * @文件名 ：DateUtil.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术有限公司
- * @日  期 ：2013-06-07
- */
+
 public class DateOperation {
 	
 	private Logger logger = LoggerFactory.getLogger( DateOperation.class );

o2server/x_calendar_core_entity/src/main/java/com/x/calendar/core/tools/LogUtil.java

@@ -6,7 +6,6 @@ import com.x.base.core.project.tools.ListTools;
 
 /**
  * 缓存管理帮助类
- * @author liyi
  *
  */
 public class LogUtil {

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

@@ -5,7 +5,6 @@ import com.x.base.core.project.cache.ApplicationCache;
 
 /**
  * 缓存管理帮助类
- * @author liyi
  *
  */
 public class CacheUtil {

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/DocumentViewRecordFactory.java

@@ -130,7 +130,7 @@ public class DocumentViewRecordFactory extends AbstractFactory {
 		CriteriaQuery<Long> cq = cb.createQuery( Long.class );
 		Root<DocumentViewRecord> root = cq.from( DocumentViewRecord.class );
 		Predicate p = cb.equal( root.get( DocumentViewRecord_.documentId ), docId );
-		if( docId != null && docId.isEmpty() ){
+		if( StringUtils.isNotEmpty(docId) ){
 			p = cb.and( p, cb.equal( root.get( DocumentViewRecord_.documentId ), docId ));
 		}
 		cq.select( cb.count( root ));

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/factory/SearchFactory.java

@@ -31,7 +31,7 @@ public class SearchFactory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery( String.class );
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.docStatus), docStatus );
-		if( categoryId != null && !categoryId.isEmpty() ){
+		if( StringUtils.isNotEmpty( categoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), categoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId ).in( appids ));
@@ -50,7 +50,7 @@ public class SearchFactory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery( String.class );
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.docStatus), docStatus );
-		if( categoryId != null && !categoryId.isEmpty() ){
+		if( StringUtils.isNotEmpty( categoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), categoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId ).in( appids ));
@@ -69,7 +69,7 @@ public class SearchFactory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery( String.class );
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.docStatus), docStatus );
-		if( categoryId != null && !categoryId.isEmpty() ){
+		if( StringUtils.isNotEmpty( categoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), categoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId ).in( appids ));
@@ -88,7 +88,7 @@ public class SearchFactory extends AbstractFactory {
 		CriteriaQuery<String> cq = cb.createQuery( String.class );
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.docStatus), docStatus );
-		if( categoryId != null && !categoryId.isEmpty() ){
+		if( StringUtils.isNotEmpty( categoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), categoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId ).in( appids ));
@@ -108,7 +108,7 @@ public class SearchFactory extends AbstractFactory {
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.creatorUnitName), creatorUnitName );
 		p = cb.and(p, cb.equal( root.get( Document_.docStatus), docStatus ));
-		if( targetCategoryId != null && !targetCategoryId.isEmpty()){
+		if( StringUtils.isNotEmpty( targetCategoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), targetCategoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId).in(appids));
@@ -128,7 +128,7 @@ public class SearchFactory extends AbstractFactory {
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.creatorTopUnitName), creatorTopUnitName );
 		p = cb.and(p, cb.equal( root.get( Document_.docStatus), docStatus ));
-		if( targetCategoryId != null && !targetCategoryId.isEmpty()){
+		if( StringUtils.isNotEmpty( targetCategoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), targetCategoryId ));
 		}else{
 			p = cb.and(p, root.get( Document_.appId).in(appids));
@@ -150,7 +150,7 @@ public class SearchFactory extends AbstractFactory {
 		CriteriaQuery<Long> cq = cb.createQuery( Long.class );
 		Root<Document> root = cq.from( Document.class );
 		Predicate p = cb.equal( root.get( Document_.docStatus), docStatus );
-		if( targetCategoryId != null && !targetCategoryId.isEmpty()){
+		if( StringUtils.isNotEmpty( targetCategoryId ) ){
 			p = cb.and(p, cb.equal( root.get( Document_.categoryId), targetCategoryId ));
 		}else{
 			p = cb.and(p, cb.equal( root.get( Document_.appId), appId));

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/CmsJaxrsFilter.java

@@ -6,8 +6,6 @@ import javax.servlet.annotation.WebFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- *
- * @author liyi *
  */
 @WebFilter(urlPatterns = {
         "/jaxrs/appcategoryadmin/*",

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionAppIconUpload.java

@@ -7,6 +7,7 @@ import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.http.WrapOutId;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 import com.x.cms.assemble.control.jaxrs.fileinfo.URLParameterGetException;
 import com.x.cms.common.image.maincolor.ImageMainColorUtil;
 import com.x.cms.core.entity.AppInfo;
@@ -89,7 +90,7 @@ public class ActionAppIconUpload extends BaseAction {
 				}
 				//先取图片主色调
 				colorList = imageUtil.getColorSolution( image, 30, 1);
-				if( colorList != null && !colorList.isEmpty() ){
+				if( ListTools.isNotEmpty( colorList ) ){
 					iconMainColor = colorList.get(0);
 				}
 				

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionEraseDocumentWithAppInfo.java

@@ -96,7 +96,7 @@ public class ActionEraseDocumentWithAppInfo extends BaseAction {
 									
 									//删除文档的附件信息
 									allFileInfoIds = business.getFileInfoFactory().listAllByDocument( docId );
-									if( allFileInfoIds != null && !allFileInfoIds.isEmpty() ){
+									if( ListTools.isNotEmpty( allFileInfoIds ) ){
 										for( String fileInfoId : allFileInfoIds ){
 											fileInfo = emc.find( fileInfoId, FileInfo.class );
 											if( fileInfo != null ){

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/appinfo/ActionListAll.java

@@ -9,6 +9,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.ListTools;
 import com.x.base.core.project.tools.SortTools;
 import com.x.cms.core.entity.AppInfo;
 
@@ -41,7 +42,7 @@ public class ActionListAll extends BaseAction {
 				logger.error( e, effectivePerson, request, null);
 			}
 			if( check ){
-				if( appInfoList != null && !appInfoList.isEmpty() ){
+				if( ListTools.isNotEmpty( appInfoList ) ){
 					try {
 						wos = Wo.copier.copy( appInfoList );
 						SortTools.desc( wos, "appInfoSeq");

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/uuid/UUIDAction.java

@@ -24,8 +24,6 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 /**
  * 该类旨在提供一个服务创建唯一的UNID
- * 
- * @author liyi
  *
  */
 @Path("uuid")

o2server/x_cms_assemble_control/src/main/java/com/x/cms/common/image/maincolor/Point.java

@@ -2,7 +2,6 @@ package com.x.cms.common.image.maincolor;
 
 /**
  * 定义RGB像素点
- * @author liyi
  *
  */
 public class Point {

o2server/x_cms_assemble_control/src/main/java/com/x/cms/common/image/maincolor/PointGroup.java

@@ -2,7 +2,6 @@ package com.x.cms.common.image.maincolor;
 
 /**
  * 点群定义
- * @author liyi
  *
  */
 public class PointGroup {

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/CategoryExt.java

@@ -18,8 +18,6 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 /**
  * 内容管理应用目录分类扩展信息
- * 
- * @author 李义
  *
  */
 @ContainerEntity

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/DocumentViewRecord.java

@@ -22,8 +22,6 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 /**
  * 内容管理日志信息表
- * 
- * @author 李义
  *
  */
 @ContainerEntity

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/FileInfo.java

@@ -37,8 +37,6 @@ import com.x.base.core.project.tools.DateTools;
 
 /**
  * 内容管理应用目录分类信息
- * 
- * @author 李义
  *
  */
 @ContainerEntity

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/Log.java

@@ -18,8 +18,6 @@ import com.x.base.core.project.annotation.FieldDescribe;
 
 /**
  * 内容管理日志信息表
- * 
- * @author 李义
  *
  */
 @ContainerEntity

o2server/x_cms_core_express/src/main/java/com/x/cms/core/express/tools/LogUtil.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 /**
  * 缓存管理帮助类
- * @author liyi
  *
  */
 public class LogUtil {

o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/control/jaxrs/JaxrsCipherFilter.java

@@ -6,8 +6,6 @@ import com.x.base.core.project.jaxrs.CipherJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * 
- * @author liyi *
  */
 @WebFilter(urlPatterns = { "/jaxrs/cipher/*" }, asyncSupported = true)
 public class JaxrsCipherFilter extends CipherJaxrsFilter {

o2server/x_hotpic_assemble_control/src/main/java/com/x/hotpic/assemble/control/jaxrs/JaxrsManagerUserFilter.java

@@ -6,8 +6,6 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * 
- * @author liyi *
  */
 @WebFilter(urlPatterns = { "/jaxrs/user/*", "/jaxrs/manager/*" }, asyncSupported = true)
 public class JaxrsManagerUserFilter extends AnonymousCipherManagerUserJaxrsFilter {

o2server/x_hotpic_assemble_control/src/main/webapp/describe/sources/com/x/hotpic/assemble/control/jaxrs/JaxrsCipherFilter.java

@@ -6,8 +6,6 @@ import com.x.base.core.project.jaxrs.CipherJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * 
- * @author liyi *
  */
 @WebFilter(urlPatterns = { "/jaxrs/cipher/*" }, asyncSupported = true)
 public class JaxrsCipherFilter extends CipherJaxrsFilter {

o2server/x_hotpic_assemble_control/src/main/webapp/describe/sources/com/x/hotpic/assemble/control/jaxrs/JaxrsManagerUserFilter.java

@@ -6,8 +6,6 @@ import com.x.base.core.project.jaxrs.AnonymousCipherManagerUserJaxrsFilter;
 
 /**
  * web服务过滤器，将指定的URL定义为需要用户认证的服务，如果用户未登录，则无法访问该服务
- * 
- * @author liyi *
  */
 @WebFilter(urlPatterns = { "/jaxrs/user/*", "/jaxrs/manager/*" }, asyncSupported = true)
 public class JaxrsManagerUserFilter extends AnonymousCipherManagerUserJaxrsFilter {

o2server/x_mind_assemble_control/src/main/java/com/x/mind/assemble/common/date/DateOperation.java

@@ -10,15 +10,7 @@ import java.util.List;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 
-/**
- * 
- * @项目名 ：Mind
- * @包  名 ：com.x.hotpic.assemble.common.date
- * @文件名 ：DateOperation.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术股份有限公司
- * @日  期 ：2016-06-07
- */
+
 public class DateOperation {
 	
 	private Logger logger =  LoggerFactory.getLogger( DateOperation.class);

o2server/x_mind_assemble_control/src/main/webapp/describe/sources/com/x/mind/assemble/common/date/DateOperation.java

@@ -10,15 +10,7 @@ import java.util.List;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
 
-/**
- * 
- * @项目名 ：Mind
- * @包  名 ：com.x.hotpic.assemble.common.date
- * @文件名 ：DateOperation.java
- * @作  者 ：李  义
- * @单  位 ：浙江兰德纵横网络技术股份有限公司
- * @日  期 ：2016-06-07
- */
+
 public class DateOperation {
 	
 	private Logger logger =  LoggerFactory.getLogger( DateOperation.class);