anderx преди 7 години
родител
ревизия
d97b2835a2

+ 0 - 3
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -667,13 +667,10 @@ public class PublicController extends BaseController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "mobile"));
 			return res;
 		}
-		
-
 		/*if (!UserType.ORGANIZATION.getCode().equals(type) && !UserType.PERSONAL.getCode().equals(type)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "type"));
 			return res;
 		}*/
-
 		User user = userService.selectByMobieAndType(mobile, type);
 		if (null == user) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "用户"));

+ 5 - 1
src/main/java/com/goafanti/user/service/impl/UserIdentityServiceImpl.java

@@ -602,10 +602,14 @@ public class UserIdentityServiceImpl extends BaseMybatisDao<UserIdentityMapper>
 		if (null == u) {
 			ui.setId(UUID.randomUUID().toString());
 			ui.setUid(user.getId());
+			if (identity.getExpert() > 0 && (identity.getAuditStatus() == AchievementAuditStatus.CREATE.getCode().intValue() || identity.getAuditStatus() == AchievementAuditStatus.UNAUDITED.getCode().intValue())) {
+				ui.setAuditStatus(AchievementAuditStatus.SUBMIT.getCode().intValue());
+			}
 			count += userIdentityMapper.insert(ui);
 		} else {
 			//暂不认证 或者认证审核中/通过,只修改认证信息中的用户信息 1, 2
-			if(identity.getExpert() == 0 || u.getAuditStatus() == AchievementAuditStatus.SUBMIT.getCode().intValue() || u.getAuditStatus() == AchievementAuditStatus.AUDITED.getCode().intValue()){
+			if(identity.getExpert() == 0 || u.getAuditStatus() == AchievementAuditStatus.SUBMIT.getCode().intValue() 
+					|| u.getAuditStatus() == AchievementAuditStatus.AUDITED.getCode().intValue()){
 				UserIdentity ui1 = new UserIdentity();
 				ui1.setId(u.getId());// 认证表id
 				//允许修改为空字符但是不能是null(以防引发空指针异常)

+ 4 - 4
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -22,18 +22,18 @@
 					<div class="regist">
 						<div class="zhuce_input">
 							<img th:src="${portalHost+'/img/name.jpg'}" alt=""/>
-							<input type="text" name="userName" value="请输入名称"  id="username" autocomplete="off"/>
+							<input type="text" name="userName" placeholder="请输入名称"  id="username" autocomplete="off"/>
 							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
 							<img th:src="${portalHost+'/img/pass2.jpg'}" alt=""/>
-							<input type="text" name="userPassword" value="请输入密码" id="userpassword" autocomplete="off"/>
+							<input type="password" name="userPassword" placeholder="请输入密码" id="userpassword" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
 							<img th:src="${portalHost+'/img/pass2.jpg'}" alt=""/>
-							<input type="text" name="userPassword2" value="确认密码" id="userpassword2" autocomplete="off"/>
+							<input type="password" name="userPassword2" placeholder="确认密码" id="userpassword2" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>
 						<div class="zhuce_input">
@@ -46,7 +46,7 @@
 						</div>
 						<div class="zhuce_input">
 							<img th:src="${portalHost+'/img/resiger_photo2.jpg'}" alt=""/>
-							<input type="text" name="photo" value="请输入手机号码" id="usePhoto" autocomplete="off"/>
+							<input type="text" name="photo" placeholder="请输入手机号码" id="usePhoto" autocomplete="off"/>
 							<span class="star"> * </span>
 						</div>						
 						<div class="cellcode">