|
|
@@ -447,9 +447,6 @@ public class UserService {
|
|
447
|
447
|
if(userBindMapper.selectUid(baseUser.getId()).stream().noneMatch(row -> row.equals(param.getId()))){
|
|
448
|
448
|
throw new TDBAException("运营商未关联该用户");
|
|
449
|
449
|
}
|
|
450
|
|
-
|
|
451
|
|
-
|
|
452
|
|
-
|
|
453
|
450
|
}
|
|
454
|
451
|
|
|
455
|
452
|
/**
|
|
|
@@ -473,8 +470,9 @@ public class UserService {
|
|
473
|
470
|
* @param baseUser
|
|
474
|
471
|
* @return
|
|
475
|
472
|
*/
|
|
476
|
|
- public List<DataTotalResp> dataTotal(BaseUser baseUser){
|
|
477
|
|
- List<DataTotalResp> list = userMapper.selectTotal(baseUser.getId());
|
|
|
473
|
+ public List<DataTotalResp> dataTotal(Integer id, BaseUser baseUser){
|
|
|
474
|
+ List<DataTotalResp> list = userMapper.selectTotal(id, baseUser.getId());
|
|
|
475
|
+
|
|
478
|
476
|
if(list.isEmpty()){
|
|
479
|
477
|
list = List.of(
|
|
480
|
478
|
DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
|
|
|
@@ -498,6 +496,21 @@ public class UserService {
|
|
498
|
496
|
.withCount(0)
|
|
499
|
497
|
.build());
|
|
500
|
498
|
}
|
|
|
499
|
+
|
|
|
500
|
+ List<Integer> idList = new ArrayList<>();
|
|
|
501
|
+ idList.add(0);
|
|
|
502
|
+ idList.add(1);
|
|
|
503
|
+ idList.add(2);
|
|
|
504
|
+ idList.add(3);
|
|
|
505
|
+ idList.add(4);
|
|
|
506
|
+ idList.removeAll(list.stream().map(DataTotalResp::getUser_type).toList());
|
|
|
507
|
+ if(!idList.isEmpty()){
|
|
|
508
|
+ list.addAll(idList.stream().map(row -> DataTotalResp.DataTotalRespBuilder.aDataTotalResp()
|
|
|
509
|
+ .withUser_type(row)
|
|
|
510
|
+ .withCount(0)
|
|
|
511
|
+ .build()).toList());
|
|
|
512
|
+ }
|
|
|
513
|
+
|
|
501
|
514
|
return list.stream().map(row -> {
|
|
502
|
515
|
row.setName(switch (row.getUser_type()){
|
|
503
|
516
|
case 0 -> "普通用户";
|