|
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.*;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/company")
|
|
@@ -240,20 +241,23 @@ public class CompanyController {
|
|
|
|
|
|
@ApiOperation(value="获取推广人员信息列表")
|
|
|
@RequestMapping(value = "promoterList",method = RequestMethod.POST)
|
|
|
- @ApiImplicitParams({
|
|
|
- @ApiImplicitParam(name = "promoters",value = "推广人员帐号(多个英文逗号隔开)", required = true, paramType = "query")
|
|
|
- })
|
|
|
- public MessageResult<List<JpCloudUser>> promoterList(String promoters){
|
|
|
+ public MessageResult<List<JpCloudUser>> promoterList(){
|
|
|
MessageResult<List<JpCloudUser>> msgResult = new MessageResult<>();
|
|
|
|
|
|
try {
|
|
|
- String[] promoterArray = promoters.split(",");
|
|
|
+ List<Company> companyList = companyService.list();
|
|
|
+
|
|
|
List<String> list = new ArrayList<>();
|
|
|
- for (String promoter : promoterArray) {
|
|
|
- list.add(promoter);
|
|
|
+
|
|
|
+ for (Company company: companyList) {
|
|
|
+ if(StringUtils.isNotEmpty(company.getPromoter())){
|
|
|
+ list.add(company.getPromoter());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(list);
|
|
|
+ List<String> disList = list.stream().distinct().collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<JpCloudUser> jpCloudUserList = jpCloudUserService.findUserByNames(disList);
|
|
|
|
|
|
msgResult.setResult(true);
|
|
|
msgResult.setData(jpCloudUserList);
|