|
|
@@ -5,8 +5,10 @@ import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.GroupsRelationMapper;
|
|
|
import com.cyksj.mapper.UserMapper;
|
|
|
+import com.cyksj.mapper.market.task.UserBindPhoneMapper;
|
|
|
import com.cyksj.model.entity.GroupsRelation;
|
|
|
import com.cyksj.model.entity.User;
|
|
|
+import com.cyksj.model.entity.UserBindPhone;
|
|
|
import com.cyksj.model.manage.views.UserView;
|
|
|
import com.ejlchina.searcher.BeanSearcher;
|
|
|
import com.ejlchina.searcher.SearchResult;
|
|
|
@@ -37,11 +39,17 @@ public class CmsUserController{
|
|
|
|
|
|
private final UserMapper userMapper;
|
|
|
|
|
|
+ private final UserBindPhoneMapper userBindPhoneMapper;
|
|
|
+
|
|
|
|
|
|
@GetMapping("/get")
|
|
|
public Result<SearchResult<UserView>> get(){
|
|
|
SearchResult<UserView> search = beanSearcher.search(UserView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
|
|
|
search.getDataList().forEach((userView)->{
|
|
|
+ UserBindPhone userBindPhone = userBindPhoneMapper.selectOne(Wrappers.lambdaQuery(UserBindPhone.class).eq(UserBindPhone::getUserId, userView.getId()).select(UserBindPhone::getPhone).last("limit 1"));
|
|
|
+ if (userBindPhone != null) {
|
|
|
+ userView.setBindPhone(userBindPhone.getPhone());
|
|
|
+ }
|
|
|
userView.setAccountNum(relationMapper.selectCount(Wrappers.lambdaQuery(GroupsRelation.class).eq(GroupsRelation::getUserId,userView.getId())));
|
|
|
if (userView.getSharedId() != null) {
|
|
|
User user = userMapper.selectById(userView.getSharedId());
|