diff --git a/src/main/java/com/gxwebsoft/cms/controller/MpController.java b/src/main/java/com/gxwebsoft/cms/controller/MpController.java index 4d7f22f..f2987c8 100644 --- a/src/main/java/com/gxwebsoft/cms/controller/MpController.java +++ b/src/main/java/com/gxwebsoft/cms/controller/MpController.java @@ -259,6 +259,10 @@ public class MpController extends BaseController { @ApiOperation("修改小程序信息") @PutMapping() public ApiResult update(@RequestBody Mp mp) { + // 只允许一个主账号 + if (mp.getType().equals(1)) { + mpService.update(new LambdaUpdateWrapper().eq(Mp::getType,1).set(Mp::getType,0)); + } if (mpService.updateById(mp)) { return success("修改成功"); } diff --git a/src/main/java/com/gxwebsoft/cms/entity/Mp.java b/src/main/java/com/gxwebsoft/cms/entity/Mp.java index 46b6ab1..d00f042 100644 --- a/src/main/java/com/gxwebsoft/cms/entity/Mp.java +++ b/src/main/java/com/gxwebsoft/cms/entity/Mp.java @@ -30,6 +30,9 @@ public class Mp implements Serializable { @TableId(value = "mp_id", type = IdType.AUTO) private Integer mpId; + @ApiModelProperty(value = "是否主账号") + private Integer type; + @ApiModelProperty(value = "小程序ID") private String appId; diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpFieldMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpFieldMapper.xml index 80a257c..8c653ce 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpFieldMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpFieldMapper.xml @@ -11,6 +11,9 @@ AND a.id = #{param.id} + + AND a.page_id = #{param.pageId} + AND a.type = #{param.type} diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpMapper.xml index c303d67..44b9596 100644 --- a/src/main/java/com/gxwebsoft/cms/mapper/xml/MpMapper.xml +++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/MpMapper.xml @@ -10,6 +10,9 @@ AND a.mp_id = #{param.mpId} + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + AND a.app_id LIKE CONCAT('%', #{param.appId}, '%') diff --git a/src/main/java/com/gxwebsoft/cms/param/MpFieldParam.java b/src/main/java/com/gxwebsoft/cms/param/MpFieldParam.java index d41de44..440da83 100644 --- a/src/main/java/com/gxwebsoft/cms/param/MpFieldParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/MpFieldParam.java @@ -27,6 +27,10 @@ public class MpFieldParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer id; + @ApiModelProperty(value = "页面ID") + @QueryField(type = QueryType.EQ) + private Integer pageId; + @ApiModelProperty(value = "类型,0文本 1图片 2其他") @QueryField(type = QueryType.EQ) private Integer type; diff --git a/src/main/java/com/gxwebsoft/cms/param/MpParam.java b/src/main/java/com/gxwebsoft/cms/param/MpParam.java index 6a3eb36..ba6713e 100644 --- a/src/main/java/com/gxwebsoft/cms/param/MpParam.java +++ b/src/main/java/com/gxwebsoft/cms/param/MpParam.java @@ -27,6 +27,9 @@ public class MpParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer mpId; + @ApiModelProperty(value = "是否主账号") + private Integer type; + @ApiModelProperty(value = "小程序ID") private String appId; diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/MpServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/MpServiceImpl.java index 292a1bd..5dd6110 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/MpServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/MpServiceImpl.java @@ -23,7 +23,7 @@ public class MpServiceImpl extends ServiceImpl implements MpServic @Override public PageResult pageRel(MpParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number asc, create_time desc"); + page.setDefaultOrder("type desc, sort_number asc, create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); }