|
|
@@ -106,21 +106,23 @@ public class FosterwxCashWorkClientController {
|
|
|
FosterwxCashBoxClientInfo fosterwxCashBoxClientInfo = new FosterwxCashBoxClientInfo();
|
|
|
if (1 == fosterwxCashScheduleTaskList.getTaskType() || 3 == fosterwxCashScheduleTaskList.getTaskType()) {
|
|
|
FosterwxCashWorkBoxClientInfo fosterwxCashWorkBoxClientInfo = fosterwxCashWorkBoxClientInfoService.getOne(new LambdaQueryWrapper<FosterwxCashWorkBoxClientInfo>().like(FosterwxCashWorkBoxClientInfo::getGhid, fosterwxCashScheduleTaskList.getBoxGhid()));
|
|
|
- FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
|
|
|
- boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
|
|
|
- boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
|
|
|
- boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
|
|
|
- boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
|
|
|
- boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
|
|
|
- boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
|
|
|
- boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
|
|
|
- boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
|
|
|
- boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
|
|
|
- boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
|
|
|
- boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
|
|
|
- boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
|
|
|
-
|
|
|
- fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
|
|
|
+ if (null != fosterwxCashWorkBoxClientInfo) {
|
|
|
+ FosterwxCashBoxClientInfo.BoxInfo boxInfo = fosterwxCashBoxClientInfo.new BoxInfo();
|
|
|
+ boxInfo.setGhid(fosterwxCashWorkBoxClientInfo.getGhid());
|
|
|
+ boxInfo.setWxid(fosterwxCashWorkBoxClientInfo.getWxid());
|
|
|
+ boxInfo.setName(fosterwxCashWorkBoxClientInfo.getName());
|
|
|
+ boxInfo.setTitle(fosterwxCashWorkwxTaskList.getTitle());
|
|
|
+ boxInfo.setEnterpoint(fosterwxCashScheduleTaskList.getBoxUrl());
|
|
|
+ boxInfo.setHeadimg(fosterwxCashWorkBoxClientInfo.getHeadimg());
|
|
|
+ boxInfo.setImage_key1(fosterwxCashWorkBoxClientInfo.getImageKey1());
|
|
|
+ boxInfo.setImage_key2(fosterwxCashWorkBoxClientInfo.getImageKey2());
|
|
|
+ boxInfo.setImage_key3(fosterwxCashWorkBoxClientInfo.getImageKey3());
|
|
|
+ boxInfo.setImageSize(fosterwxCashWorkBoxClientInfo.getImageSize());
|
|
|
+ boxInfo.setAppType(fosterwxCashWorkBoxClientInfo.getAppType());
|
|
|
+ boxInfo.setDesc(fosterwxCashWorkBoxClientInfo.getDesc());
|
|
|
+ fosterwxCashBoxClientInfo.setBoxInfo(boxInfo);
|
|
|
+ }
|
|
|
+
|
|
|
} else if (2 == fosterwxCashScheduleTaskList.getTaskType()) {
|
|
|
FosterwxCashBoxClientInfo.UrlInfo urlInfo = fosterwxCashBoxClientInfo.new UrlInfo();
|
|
|
urlInfo.setTitle(fosterwxCashWorkwxTaskList.getUrlTitle());
|