合伙人升级bug修改

src/main/java/com/ydtech/modules/admin/dao/SysUserMapper.java

@@ -580,6 +580,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select(" SELECT id FROM sys_user WHERE `status` = 1 and internal_id = 1 ")
     List<String> queryInternalNumber();
 
+    @Select("SELECT COUNT(r.role_id) FROM sys_user u LEFT JOIN sys_user_role r ON u.id = r.user_id WHERE u.mobile = #{mobile} AND r.role_id = #{roleId}")
+    int countTeamLeader(@Param("mobile")String mobile,@Param("roleId") String roleId);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1224,9 +1224,19 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResult newSaveUserInfoByPartner(SysUser2Vo sysUserVo) {
-
-
-
+        // 添加团队长
+        int tdz  = sysUserMapper.countTeamLeader(sysUserVo.getSysUser().getMobile(),RoleConstants.R21.getCode());
+        if (tdz > 0){
+            return HttpResult.error("已存在团队长，不允许再添加！！");
+        }
+        int cd  = sysUserMapper.countTeamLeader(sysUserVo.getSysUser().getMobile(),RoleConstants.R19.getCode());
+        if (cd > 0){
+            return HttpResult.error("已存在出单员，不允许再添加！！");
+        }
+        int gd  = sysUserMapper.countTeamLeader(sysUserVo.getSysUser().getMobile(),RoleConstants.R20.getCode());
+        if (gd > 0){
+            return HttpResult.error("已存在代理人，不允许再添加！！");
+        }
         SysUser sysUser = sysUserVo.getSysUser();
         String grade = String.valueOf(sysUser.getGrade());
         if (StringUtils.equals("4",grade) || StringUtils.equals("5",grade)){

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -2207,7 +2207,7 @@
         LEFT JOIN sys_role t4 ON t3.role_id = t4.id
         AND sd.del_flag = '0'
         WHERE
-         su.status in(6,2)  and su.type = 4
+         su.status in(6,2)  and su.type = 4 and t3.role_id = 97
         <if test='user !=null  '>
             <if test='user.name !=null and user.name!="" '>
                 and su.name like concat('%',#{user.name},'%')