fix:企业端分标委

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java

@@ -631,18 +631,12 @@ public class LoginController {
     @ApiOperation(value = "发送手机号验证码")
     @GetMapping(value = "/sendVerificationCode")
     public Result<?> sendVerificationCode(@RequestParam(name="phone") String phone,
-                                          @RequestParam(name="userName") String userName,
-                                          @RequestParam(name="flag") String flag) {
-        if("1".equals(flag)){
-            sysBaseAPI.sendVerificationCode(phone,"2","300",null);
-            String string = redisUtil.get("_verification:_phone:" + phone).toString();
-            return Result.OK(string);
-        }
+                                          @RequestParam(name="userName") String userName) {
         LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUser::getPhone, PasswordUtil.encrypt(phone));
         queryWrapper.eq(SysUser::getUsername, userName);
         SysUser sysUser = sysUserService.getOne(queryWrapper);
-        if (Objects.isNull(sysUser)) {
+        if (Objects.isNull(sysUser)){
             throw new JeroBootException("手机号或账号不存在");
         }
         sysBaseAPI.sendVerificationCode(phone,"2","300",null);

jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -73,7 +73,7 @@ import java.util.stream.Collectors;
 public class SysUserController {
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
-	
+
 	@Autowired
 	private ISysUserService sysUserService;
 
@@ -292,12 +292,15 @@ public class SysUserController {
         String rsaPrivateKey = String.valueOf(redisUtil.get(rsaPublicKey));
         SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
         String email;
-        String emailPassword;
+        String emailPassword = null;
         String phone;
         try {
             //1:先用私钥解密数据
             email = CommonUtils.decryptBtRsaPriKey(user.getEmail(), rsaPrivateKey);
-            emailPassword = CommonUtils.decryptBtRsaPriKey(user.getEmailPassword(), rsaPrivateKey);
+            if(org.apache.commons.lang3.StringUtils.isNotBlank(user.getEmailPassword())){
+                emailPassword = CommonUtils.decryptBtRsaPriKey(user.getEmailPassword(), rsaPrivateKey);
+                emailPassword = PasswordUtil.encrypt(emailPassword);
+            }
             phone = CommonUtils.decryptBtRsaPriKey(user.getPhone(), rsaPrivateKey);
         } catch (Exception e) {
             throw new JeroBootException("解密失败！", e);
@@ -308,7 +311,6 @@ public class SysUserController {
         ValidUtil.validate(user);
         //3:把数据加密在放回来
         email = PasswordUtil.encrypt(email);
-        emailPassword = PasswordUtil.encrypt(emailPassword);
         phone = PasswordUtil.encrypt(phone);
         user.setEmail(email);
         user.setEmailPassword(emailPassword);
@@ -1190,7 +1192,7 @@ public class SysUserController {
         }
         return result;
     }
-    
+
     /**
          *  查询当前用户的所有部门/当前部门编码
      * @return
@@ -1214,12 +1216,12 @@ public class SysUserController {
         return result;
     }
 
-    
+
 
 
 	/**
 	 * 用户注册接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @param user
 	 * @return
@@ -1330,7 +1332,7 @@ public class SysUserController {
 		result.setMessage("验证失败");
 		return result;
 	}
-	
+
 	/**
 	 * 用户手机号验证
 	 */
@@ -1358,7 +1360,7 @@ public class SysUserController {
 		result.setSuccess(true);
 		return result;
 	}
-	
+
 	/**
 	 * 用户更改密码
 	 */
@@ -1402,11 +1404,11 @@ public class SysUserController {
             return result;
         }
     }
-	
+
 
 	/**
 	 * 根据TOKEN获取用户的部分信息（返回的数据是可供表单设计器使用的数据）
-	 * 
+	 *
 	 * @return
 	 */
     @RequiresPermissions("sys:user:list")
@@ -1418,7 +1420,7 @@ public class SysUserController {
 			if (oConvertUtils.isEmpty(token)) {
 				 username = JwtUtil.getUserNameByToken(request);
 			} else {
-				 username = JwtUtil.getUsername(token);				
+				 username = JwtUtil.getUsername(token);
 			}
 
 			log.debug(" ------ 通过令牌获取部分用户信息，当前用户： " + username);
@@ -1439,7 +1441,7 @@ public class SysUserController {
 			return Result.error(500, "查询失败:" + e.getMessage());
 		}
 	}
-	
+
 	/**
 	 * 【APP端接口】获取用户列表  根据用户名和真实名 模糊匹配
 	 * @param keyword
@@ -1477,7 +1479,7 @@ public class SysUserController {
 			log.error(e.getMessage(), e);
 			return Result.error(500, "查询失败:" + e.getMessage());
 		}
-		
+
 	}
 
     /**