修改安全计算规则

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -47,7 +47,7 @@ public class AuthenticationController {
 			return null;
 		}
 		User sysUser = SystemSession.getUser();
-		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
+		//List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(sysUser.getUserUU());
 		User user = userService.findUserByUserUU(sysUser.getUserUU());
 		user.setEnterprise(sysUser.getEnterprise());
 		try{
@@ -57,7 +57,7 @@ public class AuthenticationController {
 		} catch (NullPointerException e) { }
 
 		UserInfo userInfo = new UserInfo(user);
-		if (!CollectionUtils.isEmpty(userQuestion)) {
+		if (user.getHasQuestion() == 1) {
 			userInfo.setHaveUserQuestion(true);
 			userInfo.setSecLevel((short)(1+userInfo.getSecLevel()));
 		}

src/main/java/com/uas/platform/b2c/common/account/model/UserInfo.java

@@ -75,7 +75,7 @@ public class UserInfo {
 
 	private Short countSecLevel(){
 		Short count = 0;
-		if(getIdEnable()!=null && getIdEnable()==1){
+		if(getIdEnable()!=null && getIdEnable()==2){
 			count++;
 		}
 		if(isPwdEnable()){

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -73,7 +73,6 @@ public class UserServiceImpl implements UserService {
         u.setPwdSecLevel( (short)user.getPasswordLevel());
 
         //安全强度;
-        u.setSecLevel((short)3);
         String name = user.getVipName();
         if (!StringUtils.isEmpty(name)) {
             u.setUserName(name);
@@ -103,13 +102,15 @@ public class UserServiceImpl implements UserService {
             u.setUserIdcode(idCard);
         }
         Short identityValidCode = user.getIdentityValidCode();
-        u.setEnable(identityValidCode);
+        u.setIdEnable(identityValidCode);
         String imId = user.getImId();
         if (!StringUtils.isEmpty(imId)) {
             u.setUserIMId(Long.parseLong(imId));
         }
         Short lock = user.getLock();
-
+        if (lock == 0) {
+            u.setEnable((short)1);
+        }
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if (oldUsers.size() > 0) {