--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/member/MemberServiceImpl.java

@@ -160,7 +160,7 @@ public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> impl
 
 	@Override
 	public boolean saveMember(MemberForm form) throws Exception {
-		form.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		form.setStatus(StatusEnum.ENABLE.getCode());
 		//md5密码加密
 		form.setPassword(MD5Util.getEncoderByMd5(form.getPassword()));
 		Member member = BeanUtils.copy(form, Member.class);
@@ -393,6 +393,7 @@ public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> impl
 			member.setType(MemberTypeEnum.SCHOOL.getCode());
 			member.setCreaterName(member.getName());
 			member.setCreateTime(new Date());
+			member.setStatus(StatusEnum.ENABLE.getCode());
 			memberMapper.insertSelective(member);
 		}
 		return vo;

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/press/PressServiceImpl.java

@@ -129,7 +129,7 @@ public class PressServiceImpl extends BaseModelServiceImpl<Press,Integer> implem
 	 */
 	public Integer saveMember(Press form){
 		Member member = new Member();
-		member.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		member.setStatus(StatusEnum.ENABLE.getCode());
 		member.setRelationId(form.getId());
 		member.setIsAdmin(BooleanStatusEnum.YES.getCode());
 		member.setName(form.getUserName());
@@ -157,7 +157,7 @@ public class PressServiceImpl extends BaseModelServiceImpl<Press,Integer> implem
 	public Integer saveMemberInfo(Press form){
 		User user = redis.getUser();
 		Member member = new Member();
-		member.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		member.setStatus(StatusEnum.ENABLE.getCode());
 		member.setRelationId(form.getId());
 		member.setIsAdmin(BooleanStatusEnum.YES.getCode());
 		member.setName(form.getUserName());

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/school/SchoolServiceImpl.java

@@ -138,7 +138,7 @@ public class SchoolServiceImpl extends BaseModelServiceImpl<School, Integer> imp
 		User user = redis.getUser();
 		School entity = schoolMapper.selectByPrimaryKey(form.getId());
 		Member member = new Member();
-		member.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		member.setStatus(StatusEnum.ENABLE.getCode());
 		member.setRelationId(form.getId());
 		member.setIsAdmin(BooleanStatusEnum.YES.getCode());
 		member.setName(form.getUserName());
@@ -173,7 +173,7 @@ public class SchoolServiceImpl extends BaseModelServiceImpl<School, Integer> imp
 	public Integer saveMemberInfo(School form){
 		User user = redis.getUser();
 		Member member = new Member();
-		member.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		member.setStatus(StatusEnum.ENABLE.getCode());
 		member.setRelationId(form.getId());
 		member.setIsAdmin(BooleanStatusEnum.YES.getCode());
 		member.setName(form.getUserName());
@@ -217,6 +217,7 @@ public class SchoolServiceImpl extends BaseModelServiceImpl<School, Integer> imp
 		for(ExcelSchoolVo v : importExcelVos){
 			School school = BeanUtils.copy(v, School.class);
 			school.setPassword(MD5Util.getEncoderByMd5(school.getPassword()));
+			school.setStatus(StatusEnum.ENABLE.getCode());
 			schoolMapper.insert(school);
 		}
 		return vo;

com.zrqx.core/src/main/java/com/zrqx/core/form/member/bg/member/member/UpdateStatusForm.java

@@ -11,7 +11,7 @@ import lombok.Data;
 public class UpdateStatusForm {
 	
 	@ApiModelProperty(value = "状态：0关闭,1开启",required = true)
-	private Integer status;
+	private String status;
 	@ApiModelProperty(value = "ids",required = true)
 	private List<Integer> ids;
 

com.zrqx.core/src/main/java/com/zrqx/core/model/member/member/Member.java

@@ -45,7 +45,7 @@ public class Member extends BaseModel{
 	private String sex;
 	/** {@link StatusEnum} */
 	@ApiModelProperty("用户状态 0 禁用 1启用")
-	private Integer status;
+	private String status;
 	
 	@ApiModelProperty("用户头像")
 	private String img;

com.zrqx.core/src/main/java/com/zrqx/core/vo/member/school/ImportExcelSchoolVo.java

@@ -18,7 +18,7 @@ public class ImportExcelSchoolVo {
 	@ExcelResources(title="学校名称",order=1)
 	private String name;
 	/** {@link StatusEnum}}*/
-	@ExcelResources(title="1启用0禁用",order=2)
+	@ExcelResources(title="状态:1启用0禁用",order=2)
 	private String status;
 	@ExcelResources(title="省",order=3)
 	private String province;

com.zrqx.fg.member/src/main/java/com/zrqx/bg/member/service/teacher/FgTeacherServiceImpl.java

@@ -134,7 +134,7 @@ public class FgTeacherServiceImpl extends BaseModelServiceImpl<Member,Integer> i
 	}
 	@Override
 	public boolean saveMember(FgMemberForm form) throws Exception {
-		form.setStatus(Integer.parseInt(StatusEnum.ENABLE.getCode()));
+		form.setStatus(StatusEnum.ENABLE.getCode());
 		// md5密码加密
 		form.setPassword(MD5Util.getEncoderByMd5(form.getPassword()));
 		//电话号码查重

com.zrqx.fg.member/src/main/java/com/zrqx/fg/member/service/permissions/FgPermissionsServiceImpl.java

@@ -124,7 +124,7 @@ public class FgPermissionsServiceImpl  implements FgPermissionsService {
 		// 错误10次禁用
 		if(errorCount != null && Integer.parseInt(errorCount) >= 10){
 			// 禁用
-			member.setStatus(Integer.parseInt(MemberStatusEnum.CLOSE.getCode()));
+			member.setStatus(MemberStatusEnum.CLOSE.getCode());
 			fgMemberMapper.updateByPrimaryKeySelective(member);
 			redis.delete(key);
 			redis.delete(form.getUuid());