|
@@ -13,6 +13,7 @@ import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
|
13
|
13
|
import com.huiju.estateagents.drainage.service.ITaDrainageService;
|
14
|
14
|
import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
|
15
|
15
|
import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
|
|
16
|
+import io.swagger.models.auth.In;
|
16
|
17
|
import org.slf4j.Logger;
|
17
|
18
|
import org.slf4j.LoggerFactory;
|
18
|
19
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -65,6 +66,7 @@ public class TaDrainageController extends BaseController {
|
65
|
66
|
@RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
|
66
|
67
|
@RequestParam(value ="drainageId",required = false) Integer drainageId,
|
67
|
68
|
@RequestParam(value ="name",required = false) String name,
|
|
69
|
+ @RequestParam(value ="miniapp",required = false) Integer miniapp,
|
68
|
70
|
HttpServletRequest request){
|
69
|
71
|
ResponseBean responseBean = new ResponseBean();
|
70
|
72
|
try {
|
|
@@ -72,6 +74,7 @@ public class TaDrainageController extends BaseController {
|
72
|
74
|
IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
|
73
|
75
|
QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
|
74
|
76
|
queryWrapper.eq("org_id",getOrgId(request));
|
|
77
|
+ queryWrapper.eq(null != miniapp,"is_miniapp",miniapp);
|
75
|
78
|
queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
|
76
|
79
|
queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
|
77
|
80
|
queryWrapper.orderByDesc("create_date");
|
|
@@ -183,6 +186,11 @@ public class TaDrainageController extends BaseController {
|
183
|
186
|
ResponseBean responseBean = new ResponseBean();
|
184
|
187
|
try {
|
185
|
188
|
taDrainage.setDrainageId(id);
|
|
189
|
+ if (!taDrainage.getIsMiniapp()){
|
|
190
|
+ taDrainage.setShareImg("");
|
|
191
|
+ taDrainage.setH5Address("");
|
|
192
|
+ taDrainage.setShareTitle("");
|
|
193
|
+ }
|
186
|
194
|
if (iTaDrainageService.updateById(taDrainage)){
|
187
|
195
|
responseBean.addSuccess(taDrainage);
|
188
|
196
|
}else {
|