|
|
@@ -22,10 +22,7 @@ import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.GroupsRelationAlertMapper;
|
|
|
import com.cyksj.mapper.GroupsRelationMapper;
|
|
|
import com.cyksj.mapper.UserMapper;
|
|
|
-import com.cyksj.model.entity.Account;
|
|
|
-import com.cyksj.model.entity.GroupsRelationAlert;
|
|
|
-import com.cyksj.model.entity.GroupsTrips;
|
|
|
-import com.cyksj.model.entity.GroupsTripsAccountReplaceRecord;
|
|
|
+import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.excel.ExcelGroupRelationData;
|
|
|
import com.cyksj.model.request.AccountGroupsReq;
|
|
|
import com.cyksj.model.request.ReplaceTripsAccountReq;
|
|
|
@@ -102,6 +99,13 @@ public class CmsGroupController {
|
|
|
.field(GroupsTrips::getAccount, StringUtils.isBlank(account) ? null : account).op(Operator.EndWith)
|
|
|
.build()
|
|
|
);
|
|
|
+ search.getDataList().forEach(data->{
|
|
|
+ Number count = beanSearcher.searchCount(GroupsRelation.class, MapUtils.builder()
|
|
|
+ .field(GroupsRelation::getGroupsId, data.getId())
|
|
|
+ .field(GroupsRelation::getUserId, 0).op(Operator.NotEqual)
|
|
|
+ .build());
|
|
|
+ data.setIsExists(count.intValue() > 0 ? true : false);
|
|
|
+ });
|
|
|
return GatewayResponse.SUCCESS.newBuilder().toResult(search);
|
|
|
}
|
|
|
|