feat: 自定义手机验证码登录

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/MobileServiceImpl.java

@@ -19,6 +19,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
@@ -76,8 +77,8 @@ public class MobileServiceImpl implements MobileService {
 		 * 解决验证码问题
 		 * 20201225
 		 */
-		Boolean sendFlag = false;
-
+		boolean sendFlag = false;
+		String tempCode = null;
 		if (userListNew.size() > 0) {
 			for (UserVO userVO : userListNew) {
 				if (null != userVO.getRoleList() && userVO.getRoleList().size() > 0) {
@@ -100,9 +101,9 @@ public class MobileServiceImpl implements MobileService {
 							isLevel5 = true;
 						} else if (sysRole.getRoleId() == 6) {
 							isLevel6 = true;
-						}else if (sysRole.getRoleId() == 10) {
+						} else if (sysRole.getRoleId() == 10) {
 							isLevel10 = true;
-						}else if (sysRole.getRoleId() == 13) {
+						} else if (sysRole.getRoleId() == 13) {
 							// 患者教育-HCP角色
 							isLevel13 = true;
 						}
@@ -112,9 +113,13 @@ public class MobileServiceImpl implements MobileService {
 						}
 					}
 				}
-				if(!sendFlag&&StringUtils.isNotEmpty(userVO.getTemp4())){
-					if("1".equals(userVO.getTemp4())){
-						sendFlag  = true;
+				if (!sendFlag && StringUtils.isNotEmpty(userVO.getTemp4())) {
+					// if("1".equals(userVO.getTemp4())){
+					// 	sendFlag  = true;
+					// }
+					if (StrUtil.isNotBlank(userVO.getTemp4())) {
+						sendFlag = true;
+						tempCode = userVO.getTemp4();
 					}
 				}
 			}
@@ -135,8 +140,8 @@ public class MobileServiceImpl implements MobileService {
 
 		String code = RandomUtil.randomNumbers(Integer.parseInt(SecurityConstants.CODE_SIZE));
 
-		if(sendFlag){
-			code = "5657";
+		if (sendFlag) {
+			code = "1".equals(tempCode) ? "5657" : tempCode;
 		}
 
 		try {
@@ -199,7 +204,7 @@ public class MobileServiceImpl implements MobileService {
 							isLevel9 = true;
 						}
 
-						if (isLevel2 || isLevel3 || isLevel4 ||isLevel7 || isLevel9) {
+						if (isLevel2 || isLevel3 || isLevel4 || isLevel7 || isLevel9) {
 							userList.add(userVO);
 						}
 					}