Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into tzq

src/main/java/cn/timer/api/bean/qyzx/QyzxEntInfoM.java

@@ -58,9 +58,12 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value = "电话号码 ", example = "18712345678")
 	private String phone;
 
-	@ApiModelProperty(value = "所在地区", example = "广东省广州市白云区")
+	@ApiModelProperty(value = "所在地区id", example = "广东省广州市白云区")
 	private String area;
 	
+	@ApiModelProperty(value = "所在地区中文", example = "广东省广州市白云区")
+	private String areaName;
+
 	@ApiModelProperty(value = "办公地址 ", example = "广从一路5号柏曼酒店3楼")
 	private String workAddress;
 

src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java

@@ -121,8 +121,8 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
 	@ApiModelProperty(value="微信 ",example="微信")
     private String wechat;
     
-	@ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
-    private String email;
+//	@ApiModelProperty(value="个人邮箱 ",example="个人邮箱")
+//    private String email;
     
 	@ApiModelProperty(value="血型 ",example="血型")
     private String bloodType;

src/main/java/cn/timer/api/controller/LoginController.java

@@ -495,6 +495,7 @@ public class LoginController {
 			String username = entRegisterDto.getUsername();
 			String name = entRegisterDto.getName();
 			String pw = entRegisterDto.getPw();
+			String email = entRegisterDto.getEmail();
 
 			if ((phone == null || StrUtil.hasBlank(phone)) || (username == null || StrUtil.hasBlank(username))
 					|| (name == null || StrUtil.hasBlank(name)) || (pw == null || StrUtil.hasBlank(pw))) {
@@ -525,9 +526,8 @@ public class LoginController {
 			}
 
 			if (login == null) {
-				System.err.println("kanxia");
 				// 员工信息
-				QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw))
+				QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(phone).pw(Md5.md5(pw)).email(email)
 						.sts(CommonEnum.U_STS_ON.getType()).orgId(qyId).regTime(DateUtil.date()).build();
 				boolean b2 = qyzxEmpLogin.insert();
 				if (!b2) {
@@ -536,9 +536,9 @@ public class LoginController {
 				}
 				login = qyzxEmpLogin;
 			}
-			// 1-是主账号管理员
-			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date()).isManager(1)
-					.name(username).phone(phone).jobType(YgJobType.QUANZHI.getType())
+			// 员工信息
+			boolean b4 = YgglMainEmp.builder().orgCode(qyId).empNum(login.getId()).rzTime(new Date())
+					.name(username).phone(phone).workEmail(email).jobType(YgJobType.QUANZHI.getType())
 					.jobStatus(YgEnumInterface.jobStatus.ZHENSHI.getType()).build().insert();
 			if (!b4) {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

src/main/java/cn/timer/api/dto/qyzx/EntRegisterDto.java

@@ -37,6 +37,9 @@ public class EntRegisterDto implements Serializable {
 	@ApiModelProperty(value = "验证码 ", example = "666666")
 	private String code;
 
+	@ApiModelProperty(value = "邮箱", example = "youxiang@qq.com")
+	private String email;
+
 	@ApiModelProperty(value = "1.验证码 2.消息推送 3通知提醒 ", example = "1")
 	private Integer messageType;