bug

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -26,7 +26,7 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	
-	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
+	List<TaUser> getUserList(@Param("phone") String phone,@Param("orgId") Integer orgId);
 
     IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -402,8 +402,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("用户名称不能为空");
         }
 
-        if (StringUtils.isEmpty(taUser.getLoginName())) {
-            taUser.setLoginName(taUser.getPhone());
+        if (!StringUtils.isEmpty(taUser.getLoginName())) {
+            QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+            wrapper.eq("login_name", taUser.getLoginName());
+            List<TaUser> taUserList = this.list(wrapper);
+            if (null != taUserList && taUserList.size() > 0) {
+                throw new Exception("登录名重复");
+            }
         }
 
         boolean weightCount = validateWeight(taUser, "add");
@@ -411,9 +416,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("同一项目下权重值不能重复");
         }
 
-        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getLoginName(), taUser.getOrgId());
+        List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(), taUser.getOrgId());
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("电话号码或登录名重复");
+            throw new Exception("电话号码重复");
         }
         taUser.setLoginPassword(MD5Utils.md5(MD5Utils.md5("123456")));
         taUser.setStatus(CommConstant.STATUS_NORMAL);
@@ -481,8 +486,15 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (StringUtils.isEmpty(taUser.getWeight())) {
             taUser.setWeight(null);
         }
-        if (StringUtils.isEmpty(taUser.getLoginName()) && taUserBefore.getLoginName().equals(taUserBefore.getPhone())) {
-            taUser.setLoginName(taUser.getPhone());
+        if (!StringUtils.isEmpty(taUser.getLoginName()) && !taUser.getLoginName().equals(taUserBefore.getLoginName())) {
+            if (!StringUtils.isEmpty(taUser.getLoginName())) {
+                QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
+                wrapper.eq("login_name", taUser.getLoginName());
+                List<TaUser> taUserList = this.list(wrapper);
+                if (null != taUserList && taUserList.size() > 0) {
+                    throw new Exception("登录名重复");
+                }
+            }
         }
 
         boolean weightCount = validateWeight(taUser, "update");
@@ -491,12 +503,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         }
 
         QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
-        wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+//        wrapper.nested(q -> q.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName()));
+        wrapper.eq("phone", taUser.getPhone());
         wrapper.eq("org_id", taUser.getOrgId());
         wrapper.ne("user_id", taUser.getUserId());
         List<TaUser> taUserList = this.list(wrapper);
         if (null != taUserList && taUserList.size() > 0) {
-            throw new Exception("电话号码或登录名重复");
+            throw new Exception("电话号码重复");
         }
         if (taUserMapper.updateById(taUser) < 1) {
             throw new Exception("更新用户信息失败");

src/main/resources/mapper/TaUserMapper.xml

@@ -56,11 +56,8 @@
     FROM
         ta_user
     WHERE
-    <if test="orgId != null and orgId != ''">
-        org_id = #{orgId} and
-    </if>
-         (phone = #{phone}
-        OR login_Name = #{loginName})
+        org_id = #{orgId}
+        and phone = #{phone}
     </select>
     <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
         SELECT