|
|
|
@@ -92,7 +92,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); |
|
|
|
} else { |
|
|
|
info.setLevel(WxLevelConfigService.DEFAULT_LEVEL); |
|
|
|
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(getTenantInfo()); |
|
|
|
List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantInfo(ifParentUpdateTenantInfo()); |
|
|
|
for (WxLevelConfig levelConfig : levelList) { |
|
|
|
if (info.getPoins() >= levelConfig.getPoints()) { |
|
|
|
info.setLevel(levelConfig.getLevel()); |
|
|
|
@@ -107,7 +107,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
WxCUserTags uTag = wxCUserTagsService.getById(info.getTagId()); |
|
|
|
if (uTag != null && StringUtils.isNotBlank(uTag.getTags())) { |
|
|
|
List<Long> ids = JSONObject.parseArray(uTag.getTags(), Long.class); |
|
|
|
info.setTagsList(wxCUserTagsService.findTagList(getTenantInfo(), ids)); |
|
|
|
info.setTagsList(wxCUserTagsService.findTagList(ifParentUpdateTenantInfo(), ids)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -147,7 +147,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
wxCUserBasicInfo.setName(null); |
|
|
|
} |
|
|
|
} |
|
|
|
wxCUserBasicInfo.undateFinalTenantId(getTenantInfo()); |
|
|
|
wxCUserBasicInfo.undateFinalTenantId(getTenantInfo());11111 |
|
|
|
// wxCUserBasicInfo.setSortColumns(BaseEntity.SortField.ActiveTime_DESC); |
|
|
|
PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); |
|
|
|
|
|
|
|
@@ -185,7 +185,8 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
if (StringUtils.isNotBlank(wxCUserBasicInfo.getTagIds())) { |
|
|
|
WxCUserTags record = new WxCUserTags(); |
|
|
|
record.setUserId(oldInfo.getId()); |
|
|
|
record.updateTenantInfo(tenantEntity); |
|
|
|
// record.updateTenantInfo(tenantEntity); |
|
|
|
record.setTenantId(oldInfo.getFinalTenantId()); |
|
|
|
PageInfo<WxCUserTags> page = wxCUserTagsService.listAsPage(record, 1, 1); |
|
|
|
if (page.getSize() > 0) { |
|
|
|
WxCUserTags t = page.getList().get(0); |
|
|
|
@@ -312,7 +313,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
basicInfo.undateFinalTenantId(getTenantInfo()); |
|
|
|
basicInfo.undateFinalTenantId(getTenantInfo());111111 |
|
|
|
int exportDataCount = wxCUserBasicInfoService.exportDataCount(basicInfo); |
|
|
|
return new ResultData(exportDataCount); |
|
|
|
|
|
|
|
@@ -335,7 +336,7 @@ public class WxCUserBasicInfoController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
basicInfo.undateFinalTenantId(getTenantInfo()); |
|
|
|
basicInfo.undateFinalTenantId(getTenantInfo());1111111 |
|
|
|
wxCUserBasicInfoService.exportData(basicInfo, request, response); |
|
|
|
|
|
|
|
} |
|
|
|
|