--no commit message

app/member/src/main/java/com/zrqx/member/bg/member/mapper/MemberMapper.java

@@ -21,7 +21,7 @@ public interface MemberMapper extends BaseMapper<Member>{
 			+ " eq(pm.vip,form.vip) "
 			+ "</if>"
 			+"<if test='form.vip==3'>"
-			+ " eq(pm.orderType,form.vip) "
+			+ " eq(pm.orderType,1) "
 			+ "</if>"
 			+ "<if test = '"+NOTBLANK+"(form.beginTime)' >"
 			+ "<![CDATA["

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

@@ -76,6 +76,8 @@ public class OrganController {
 			Organ entity = new Organ();
 			BeanUtils.copyProperties(organ, entity);
 			entity.setCreateTime(new Date());
+			entity.setEndTime(organ.getEndTime());
+			entity.setBeginTime(organ.getBeginTime());
 			entity.setRelatedResourceTypes(this.getRelatedResourceTypes(organ));
 			entity.setCreater(redis.getUser().getUserName());
 			entity.setUpdater(redis.getUser().getUserName());
@@ -88,6 +90,8 @@ 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());
 			entity.setUpdateTime(new Date());
 			if (!service.updateByPrimaryKey(entity)) {
 				throw new BaseException(ResponseCodeEnum.FAIL);

app/member/src/main/java/com/zrqx/member/commons/form/bg/organ/SaveOrUpdateOrganForm.java

@@ -26,7 +26,10 @@ public class SaveOrUpdateOrganForm {
 	@ApiModelProperty(value = "是否机构 0:否 1:是  默认 0")
 	private Integer orderType;
 	
-	
+	@ApiModelProperty(value = "开始时间", required = true)
+	private Date beginTime;
+	@ApiModelProperty(value = "到期时间", required = true)
+	private Date endTime;
 
 	@ApiModelProperty(value = "已关联ip组")
 	private String ipGroup;