只有团队长和代理人才能邀请

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -468,42 +468,31 @@ public class SysUserController extends BaseController {
     @Transactional
     public HttpResult agentRegist(@RequestBody AgentUserDto dto) {
         int noCount = 3;//顺序号是几位的
-        Integer result = 0;
-        String resultStr = "";
 
         String phoneMsg = dto.getMobileMsg();
         if (StringUtils.isNullOrEmpty(phoneMsg)) {
             return HttpResult.error("短信验证码不能为空");
         }
-//        //从数据库获取最新验证码
-//        String msg = stringRedisTemplate.opsForValue().get(PHONE_VERIFICATION_CODE_KEY + dto.getMobile());
-//
-//        if (msg == null || msg.length() == 0) {
-//            return HttpResult.error("短信验证码发送失败");
-//        }
-//        if (!phoneMsg.equals(msg)) {
-//            return HttpResult.error("短信验证码不正确");
-//        }
         String recommenderid = dto.getReferrerId();
-//        if (StringUtils.isNullOrEmpty(recommenderid)) {
-//            return HttpResult.error("推荐人ID不能为空");
-//        }
+
         SysUser recommender = sysUserService.getById(recommenderid);
         if (recommender == null) {
             return HttpResult.error("推荐人信息不存在");
         }
         //只有团队长和代理人才能邀请 by gws
         SysUserRole recommenderRole =sysUserRoleService.selectByUserId(recommenderid);
-        if(!"20".equals(recommenderRole.getRoleId())&&!"21".equals(recommenderRole.getRoleId())){
+
+        if(!"20".equals(recommenderRole.getRoleId().toString()) && !"21".equals(recommenderRole.getRoleId().toString())){
             return HttpResult.error("只有团队长和代理人才能邀请");
         }
+
         SysUser sysUser = sysUserService.findByPhone(dto.getMobile());
         if (sysUser != null) {
             return HttpResult.error("手机号已存在");
         } else {
             sysUser = new SysUser();
         }
-        String nextPK = "001";
+        String nextPK;
         //根据机构号获取userid最大值，不需要加人员类型判断  从sys_user获取
         String maxId = sysUserService.findMaxId(recommender.getDeptId());
         if (StringUtils.isNullOrEmpty(maxId)) {
@@ -511,7 +500,7 @@ public class SysUserController extends BaseController {
         } else {
             nextPK = IdGenerate.nextCode(maxId, noCount);
         }
-        if (dto.getName() != null && !dto.getName().equals("")) {
+        if (dto.getName() != null && !dto.getName().isEmpty()) {
         } else {
             sysUser.setName("游客");
         }
@@ -533,7 +522,6 @@ public class SysUserController extends BaseController {
         userRole.setRoleId(20L);
         sysUserRoleService.save(userRole);
 
-
         esmUserReferrerService.addReferrer(dto.getReferrerId(),nextPK);
 
         return HttpResult.ok("保存成功", sysUser.getId());
@@ -741,4 +729,5 @@ public class SysUserController extends BaseController {
         return HttpResult.ok(sysUserService.updateById(sysUser));
     }
 
+
 }