ソースを参照

fix

release_toaliyun_real
xiaohanzi 5年前
コミット
48c15aa3b3
4個のファイルの変更15行の追加9行の削除
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java
  3. +6
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java
  4. +4
    -4
      mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java ファイルの表示

@@ -338,7 +338,6 @@ public class WxCUserBasicInfoController extends BaseController {


basicInfo.undateFinalTenantId(ifParentUpdateTenantInfo()); basicInfo.undateFinalTenantId(ifParentUpdateTenantInfo());
wxCUserBasicInfoService.exportData(ifParentUpdateTenantInfo(),basicInfo, request, response); wxCUserBasicInfoService.exportData(ifParentUpdateTenantInfo(),basicInfo, request, response);

} }


@RequestMapping("/exportTemplate") @RequestMapping("/exportTemplate")


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCUserTags.java ファイルの表示

@@ -17,12 +17,16 @@ public class WxCUserTags extends BaseTenantEntity {


@io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId")
private Long userId; private Long userId;
@TableField(exist = false) @TableField(exist = false)
private List<Long> userIds;
private List<Long> userIdList;
@io.swagger.annotations.ApiModelProperty(value="",name="tags") @io.swagger.annotations.ApiModelProperty(value="",name="tags")
private String tags; private String tags;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;


+ 6
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java ファイルの表示

@@ -1232,10 +1232,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
basicInfo.undateFinalTenantId(tenantInfo); basicInfo.undateFinalTenantId(tenantInfo);
} }
list = wxCUserBasicInfoMapper.findVoList(basicInfo); list = wxCUserBasicInfoMapper.findVoList(basicInfo);
if (null == list || list.size() <= 0 ) {
return null;
}
List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo); List<Long> userIds = wxCUserBasicInfoMapper.findVoIdsList(basicInfo);
if (null != userIds ) {
if (null != userIds && userIds.size() > 0 ) {
WxCUserTags tq = new WxCUserTags(); WxCUserTags tq = new WxCUserTags();
tq.setUserIds(userIds);
tq.setUserIdList(userIds);
List<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq); List<WxCUserTags> userTagList = wxCUserTagsMapper.findList(tq);
if (null != userTagList) { if (null != userTagList) {
List<WxTags> tagList = wxTagsMapper.findListAll(); List<WxTags> tagList = wxTagsMapper.findListAll();
@@ -1253,7 +1256,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc
} }
} }
if (null != list ) {
if (null != list && list.size() > 0 ) {
List<Object> retList = new ArrayList<Object>(); List<Object> retList = new ArrayList<Object>();
retList.addAll(list); retList.addAll(list);
return retList; return retList;


+ 4
- 4
mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml ファイルの表示

@@ -47,10 +47,10 @@


</if> </if>
<if test=" null != userIds ">
and user_id in
<foreach collection="userIds" index="index" item="userIdItem" open="(" separator="," close=")">
#{userIdItem}
<if test=" null != userIdList ">
and `user_id` in
<foreach collection="userIdList" index="index" item="uItem" open="(" separator="," close=")">
#{uItem}
</foreach> </foreach>
</if> </if>


読み込み中…
キャンセル
保存