|
|
|
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("wxCUserBasicInfo") |
|
|
|
@@ -53,20 +54,21 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfoDto(); |
|
|
|
String tenantId = getTenantId(); |
|
|
|
wxCUserBasicInfo.setTenantId(tenantId); |
|
|
|
PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) |
|
|
|
&& wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null |
|
|
|
&& StringUtils.isBlank(wxCUserBasicInfo.getName()) |
|
|
|
) {//当只有手机号查询并且查不到数据 ,新增 |
|
|
|
WxCUser cUser = new WxCUser(); |
|
|
|
cUser.setTenantId(tenantId); |
|
|
|
cUser.setPhone(wxCUserBasicInfo.getPhone()); |
|
|
|
PageInfo<WxCUser> cUsers = wxCUserService.listAsPage(cUser, 1, 1); |
|
|
|
if (cUsers.getSize() > 0) { |
|
|
|
createUserBasicInfo(cUsers.getList().get(0)); |
|
|
|
page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<Map<String,Object>> page = wxCUserBasicInfoService.queryListMap(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
// PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
// if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) |
|
|
|
// && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null |
|
|
|
// && StringUtils.isBlank(wxCUserBasicInfo.getName()) |
|
|
|
// ) {//当只有手机号查询并且查不到数据 ,新增 |
|
|
|
// WxCUser cUser = new WxCUser(); |
|
|
|
// cUser.setTenantId(tenantId); |
|
|
|
// cUser.setPhone(wxCUserBasicInfo.getPhone()); |
|
|
|
// PageInfo<WxCUser> cUsers = wxCUserService.listAsPage(cUser, 1, 1); |
|
|
|
// if (cUsers.getSize() > 0) { |
|
|
|
// createUserBasicInfo(cUsers.getList().get(0)); |
|
|
|
// page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
// } |
|
|
|
// } |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
|