Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -303,14 +303,29 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
     public void deleteByMemberIds(Collection<Integer> userIds) {
-       Example example = new Example(AppUserRelation.class);
+        Example example = new Example(AppUserRelation.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andIn("parentId",userIds);
+        List<AppUserRelation> list=mapper.selectByExample(example);
+        for (AppUserRelation appUserRelation:list){
+            getMyBiz().delRelation(appUserRelation.getUserId());
+        }
         mapper.deleteByExample(example);
-
         Example example2 = new Example(AppUserRelation.class);
         Example.Criteria criteria1 = example2.createCriteria();
         criteria1.andIn("userId",userIds);
         mapper.deleteByExample(example2);
+        for (Integer userId:userIds){
+            getMyBiz().delRelation(userId);
+        }
+    }
+    @CacheClear(key="user:relation{1}")
+    public  void delRelation(Integer userId){
+
     }
-}
+
\ No newline at end of file
+
+
+
+    }
+

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java

@@ -63,12 +63,14 @@ public class DataController {
     }
 
     @GetMapping("/clear_relation_withphone")
-    public ObjectRestResponse<Void> clearRelation(@RequestParam("phones") List<String> phones){
-        Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
+    public ObjectRestResponse<Void> clearRelationphone(@RequestParam("phones") List<String> phons) {
+
+        Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
         if (Objects.nonNull(phoneAndUserIdMapByPhones)){
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
             appUserRelationBiz.deleteByMemberIds(userIds);
             appUserSellingWaterBiz.deleteByMemberIds(userIds);
+
         }
         return ObjectRestResponse.succ();
     }