Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

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

@@ -12,10 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author libin
@@ -42,16 +39,18 @@ public class DataController {
     @Autowired
     private ActivityFeign activityFeign;
 
-    @GetMapping("/clearByPhone")
+    @GetMapping("/clearwithphone")
     public ObjectRestResponse<Void> clearData(@RequestParam("phones") List<String> phons) {
 
         Map<String, Integer> phoneAndUserIdMapByPhones = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phons);
+        if (Objects.nonNull(phoneAndUserIdMapByPhones)){
             Collection<Integer> userIds = phoneAndUserIdMapByPhones.values();
             appUserLoginBiz.deleteByPhones(phons);
             appUserDetailBiz.deleteByUserIds(userIds);
             appUserRelationBiz.deleteByMemberIds(userIds);
             appUserSellingWaterBiz.deleteByMemberIds(userIds);
             activityFeign.clearDate(new ArrayList<>(userIds));
+        }
         return ObjectRestResponse.succ();
     }
 }
\ No newline at end of file