添加根据id获取家族信息接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiTemplateController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.TPersonalImg;
+import com.ruoyi.system.domain.TPersonalPage;
 import com.ruoyi.system.service.ITPersonalImgService;
 import com.ruoyi.system.service.ITPersonalPageService;
 import io.swagger.annotations.Api;
@@ -48,7 +49,11 @@ public class ApiTemplateController extends BaseController {
     @GetMapping(value = "/getPersonal/{id}")
     public AjaxResult getPersonal(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(tPersonalPageService.getById(id));
+        TPersonalPage personalPage = tPersonalPageService.getById(id);
+        if (personalPage != null && "1".equals(personalPage.getEnable())) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.success(personalPage);
     }
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TPersonalMessageController.java

@@ -61,9 +61,6 @@ public class TPersonalMessageController extends BaseController {
         if (StringUtils.isNotBlank(tPersonalMessage.getContents())){
             lqw.eq(TPersonalMessage::getContents ,tPersonalMessage.getContents());
         }
-        if (StringUtils.isNotBlank(tPersonalMessage.getModel())){
-            lqw.eq(TPersonalMessage::getModel ,tPersonalMessage.getModel());
-        }
         List<TPersonalMessage> list = iTPersonalMessageService.list(lqw);
         return getDataTable(list);
     }

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyController.java

@@ -271,4 +271,19 @@ public class FamilyController extends AppBaseController {
         return AjaxResult.success("退出成功");
     }
 
+
+    /**
+     * 获取家族详细信息
+     */
+    @ApiOperation("获取家族详细信息")
+    @ApiImplicitParam(name = "id", value = "主键id",paramType="Long")
+    @GetMapping(value = "/getById/{id}" )
+    public AjaxResult getInfo(Long id) {
+        if (id == null){
+            return AjaxResult.error("id不能为空");
+        }
+        TbFamily family = familyService.getById(id);
+        return AjaxResult.success(family);
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/TPersonalMessage.java

@@ -55,11 +55,6 @@ public class TPersonalMessage implements Serializable {
     @Excel(name = "留言内容" , readConverterExp = "选=择内容模板")
     private String contents;
 
-    /** 内容模板 */
-    @ApiModelProperty(value="内容模板")
-    @Excel(name = "内容模板")
-    private String model;
-
     /** 创建者 */
     @ApiModelProperty(value="创建者")
     private Long createBy;

ruoyi-system/src/main/resources/mapper/system/TPersonalMessageMapper.xml

@@ -9,7 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="personalId"    column="personal_id"    />
         <result property="type"    column="type"    />
         <result property="contents"    column="contents"    />
-        <result property="model"    column="model"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />