--no commit message

app/member/src/main/java/com/zrqx/member/bg/organ/controller/OrganController.java

@@ -21,6 +21,7 @@ import com.zrqx.core.commons.redis.Redis;
 import com.zrqx.core.enums.ResponseCodeEnum;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.util.datatype.ArrayUtils;
+import com.zrqx.core.util.datatype.DateUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
@@ -76,8 +77,12 @@ public class OrganController {
 			Organ entity = new Organ();
 			BeanUtils.copyProperties(organ, entity);
 			entity.setCreateTime(new Date());
-			entity.setEndTime(organ.getEndTime());
-			entity.setBeginTime(organ.getBeginTime());
+			if(StringUtils.isNotBlank(organ.getEndTime())) {
+			entity.setEndTime(DateUtils.strToDateTime(organ.getEndTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
+			}
+			if(StringUtils.isNotBlank(organ.getBeginTime())) {
+			entity.setBeginTime(DateUtils.strToDateTime(organ.getBeginTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD)  );
+			}
 			entity.setRelatedResourceTypes(this.getRelatedResourceTypes(organ));
 			entity.setCreater(redis.getUser().getUserName());
 			entity.setUpdater(redis.getUser().getUserName());
@@ -90,8 +95,12 @@ public class OrganController {
 			BeanUtils.copyProperties(organ, entity);
 			entity.setRelatedResourceTypes(this.getRelatedResourceTypes(organ));
 			entity.setUpdater(redis.getUser().getUserName());
-			entity.setEndTime(organ.getEndTime());
-			entity.setBeginTime(organ.getBeginTime());
+			if(StringUtils.isNotBlank(organ.getEndTime())) {
+				entity.setEndTime(DateUtils.strToDateTime(organ.getEndTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
+				}
+				if(StringUtils.isNotBlank(organ.getBeginTime())) {
+				entity.setBeginTime(DateUtils.strToDateTime(organ.getBeginTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD)  );
+				}
 			entity.setUpdateTime(new Date());
 			if (!service.updateByPrimaryKey(entity)) {
 				throw new BaseException(ResponseCodeEnum.FAIL);