Commit d64b6087 by 徐高华

离职继承欢迎语/删除判断是否单向好友

parent cf07dfe9
...@@ -26,6 +26,8 @@ public class WelcomeDetailBO { ...@@ -26,6 +26,8 @@ public class WelcomeDetailBO {
* 欢迎语类型 * 欢迎语类型
*/ */
private Integer type; private Integer type;
private int scene ;
/** /**
* 内容 * 内容
*/ */
...@@ -51,6 +53,14 @@ public class WelcomeDetailBO { ...@@ -51,6 +53,14 @@ public class WelcomeDetailBO {
*/ */
private List<WelcomeMediaBO> welcomeMediaList; private List<WelcomeMediaBO> welcomeMediaList;
public int getScene() {
return scene;
}
public void setScene(int scene) {
this.scene = scene;
}
public String getWelcomeId() { public String getWelcomeId() {
return welcomeId; return welcomeId;
} }
......
...@@ -66,6 +66,16 @@ public class WelcomeListBO { ...@@ -66,6 +66,16 @@ public class WelcomeListBO {
private Integer type; private Integer type;
private int scene ;
public int getScene() {
return scene;
}
public void setScene(int scene) {
this.scene = scene;
}
public String getCreatorId() { public String getCreatorId() {
return creatorId; return creatorId;
} }
......
...@@ -304,6 +304,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -304,6 +304,7 @@ public class WelcomeServiceImpl implements WelcomeService {
bo.setOperatorName(one.getOperatorName()); bo.setOperatorName(one.getOperatorName());
bo.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag()); bo.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
bo.setType(one.getType()); bo.setType(one.getType());
bo.setScene(one.getScene());
// 媒体列表 // 媒体列表
bo.setWelcomeMediaList( bo.setWelcomeMediaList(
convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId())) convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(one.getWelcomeId()))
...@@ -347,6 +348,7 @@ public class WelcomeServiceImpl implements WelcomeService { ...@@ -347,6 +348,7 @@ public class WelcomeServiceImpl implements WelcomeService {
welcomeDetail.setOpenFlag(welcome.getOpenFlag()); welcomeDetail.setOpenFlag(welcome.getOpenFlag());
welcomeDetail.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag()); welcomeDetail.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag());
welcomeDetail.setType(welcome.getType()); welcomeDetail.setType(welcome.getType());
welcomeDetail.setScene(welcome.getScene());
// 媒体列表 // 媒体列表
welcomeDetail.setWelcomeMediaList( welcomeDetail.setWelcomeMediaList(
convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId())) convertWelcomeMedia(welcomeMediaMapper.listByWelcomeId(welcome.getWelcomeId()))
......
...@@ -111,6 +111,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -111,6 +111,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
dto.setOperatorName(one.getOperatorName()); dto.setOperatorName(one.getOperatorName());
dto.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag()); dto.setDefaultWelcomeFlag(one.getDefaultWelcomeFlag());
dto.setType(one.getType()); dto.setType(one.getType());
dto.setScene(one.getScene());
// 媒体列表 // 媒体列表
dto.setWelcomeMediaList( dto.setWelcomeMediaList(
CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList() CollectionUtils.isEmpty(one.getWelcomeMediaList()) ? Collections.emptyList()
...@@ -139,6 +140,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService { ...@@ -139,6 +140,7 @@ public class WelcomeApiServiceImpl implements WelcomeApiService {
dto.setOpenFlag(welcome.getOpenFlag()); dto.setOpenFlag(welcome.getOpenFlag());
dto.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag()); dto.setDefaultWelcomeFlag(welcome.getDefaultWelcomeFlag());
dto.setType(welcome.getType()); dto.setType(welcome.getType());
dto.setScene(welcome.getScene());
// 媒体列表 // 媒体列表
dto.setWelcomeMediaList( dto.setWelcomeMediaList(
CollectionUtils.isEmpty(welcome.getWelcomeMediaList()) ? Collections.emptyList() CollectionUtils.isEmpty(welcome.getWelcomeMediaList()) ? Collections.emptyList()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment