合并4050

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToOperateTelMapper.java

@@ -27,4 +27,11 @@ public interface ToOperateTelMapper {
      * @return
      */
     List<ToOperateTel> getPhoneList(@Param("name") String name, @Param("tel") String tel, @Param("remark") String remark);
+
+    /**
+     * 根据手机号查询当前信息
+     * @param tel
+     * @return
+     */
+    ToOperateTel selectOperate(@Param("tel") String tel);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -342,6 +342,11 @@ public class ToUserServerImpl implements IToUserService {
             response.addError("请输入正确的手机号!");
             return response;
         }
+        ToOperateTel operateTel= toOperateTelMapper.selectOperate(tel);
+        if (null != operateTel){
+            response.addError("电话号码重复");
+            return response;
+        }
 
         ToOperateTel toOperateTel= new ToOperateTel();
         toOperateTel.setName(name);
@@ -370,6 +375,7 @@ public class ToUserServerImpl implements IToUserService {
             responseBean.addError("请输入正确的手机号!");
             return responseBean;
         }
+
         ToOperateTel toOperateTel = new ToOperateTel();
         toOperateTel.setId(id);
         toOperateTel.setTel(tel);
@@ -377,8 +383,24 @@ public class ToUserServerImpl implements IToUserService {
         toOperateTel.setRemark(remark);
         toOperateTel.setUpdateUser(userElement.getId());
         toOperateTel.setUpdateDate(new Date());
-        toOperateTelMapper.updateByPrimaryKey(toOperateTel);
-        responseBean.addSuccess("成功");
+
+        // 输入的电话
+        ToOperateTel operateTel= toOperateTelMapper.selectOperate(tel);
+        // 根据ID查询当前信息
+        ToOperateTel currentOperateTel = toOperateTelMapper.selectByPrimaryKey(id);
+        if (null != operateTel && null != currentOperateTel){
+            // 排除自身
+            if (operateTel.getId().equals(currentOperateTel.getId())) {
+                toOperateTelMapper.updateByPrimaryKey(toOperateTel);
+                responseBean.addSuccess("成功");
+                return responseBean;
+            }
+        }
+        // 手机号不存时可以更新
+        if (null == operateTel){
+            toOperateTelMapper.updateByPrimaryKey(toOperateTel);
+        }
+        responseBean.addError("电话号码重复");
         return responseBean;
     }
 

CODE/smart-community/operate-api/src/main/resources/mapper/ToOperateTelMapper.xml

@@ -144,4 +144,11 @@
     </where>
     ORDER BY to_operate_tel.update_date desc
   </select>
+
+  <select id="selectOperate" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from to_operate_tel
+    where  tel = #{tel,jdbcType=VARCHAR}
+  </select>
 </mapper>