瀏覽代碼

编辑家族成员时,当手机号已存在,则不允许编辑;修改族友圈查询所在所有家族的族友圈信息;

Alex 4 年之前
父節點
當前提交
0876c80d30

+ 14 - 0
ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -385,6 +385,20 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         if (StringUtils.isNotBlank(member.getMemberRemark())) {
             member.setMemberRemark(member.getMemberRemark());
         }
+        // 根据memberID获取
+        AppMemberVo memberVo1 = userService.getMember("member",member.getMemberId().toString(),null);
+        // 根据手机号获取
+        AppMemberVo memberVo2 = userService.getAppMember(null,member.getMobile());
+        if (memberVo1 == null) {
+            return AjaxResult.error("保存失败,成员信息为空");
+        }
+        if (memberVo2 != null){
+            // 手机号更改并且手机号已存在
+            if (!memberVo1.getMobile().equals(member.getMobile()) &&
+                    memberVo2.getMobile().equals(member.getMobile())) {
+                return AjaxResult.error("修改的手机号已存在");
+            }
+        }
 
         return saveOrUpdate(member);
     }

+ 1 - 1
ruoyi-system/src/main/resources/mapper/app/TbMyPublishMapper.xml

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) a
         left join tb_app_user u on u.id = a.app_user_id
         left join tb_family_member m on m.app_user_id = a.app_user_id
-        ) b
+        ) b ORDER BY b.create_time desc
     </select>
 
 </mapper>