修改一些测试bug

gis_cms/src/main/java/com/gis/cms/controller/MournController.java

@@ -42,7 +42,7 @@ public class MournController {
 
     @ApiOperation("场景详情")
     @GetMapping("detail/{id}")
-    public Result<MournEntity> detail(@PathVariable Long id) {
+    public Result<MournVo> detail(@PathVariable Long id) {
         return entityService.detail(id);
     }
 

gis_cms/src/main/java/com/gis/cms/entity/vo/MournVo.java

@@ -15,13 +15,13 @@ import java.io.Serializable;
 public class MournVo extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 7167520531265687441L;
 
-    @ApiModelProperty(value = "单位")
+    @ApiModelProperty(value = "用户单位")
     private String unit;
 
-    @ApiModelProperty(value = "真实姓名")
+    @ApiModelProperty(value = "用户真实姓名")
     private String realName;
 
-    @ApiModelProperty(value = "昵称")
+    @ApiModelProperty(value = "用户昵称")
     private String nickName;
 
     @ApiModelProperty(value = "烈士id")
@@ -42,6 +42,9 @@ public class MournVo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否显示真实姓名： 1：是， 0：否")
     private Integer isRealName;
 
+    /**
+     * 主要，这个名字错了，将错就错
+     */
     @ApiModelProperty(value = "烈士真实姓名")
     private String martyRealName;
 

gis_cms/src/main/java/com/gis/cms/mapper/MournMapper.java

@@ -28,4 +28,8 @@ public interface MournMapper extends IBaseMapper<MournEntity, Long> {
 
     @Update("update tb_mourn set visit = visit + 1 , update_time = NOW() where is_delete = 0  and id = #{id}")
     void addVisit(Long id);
+
+    @Select("SELECT a.*,b.real_name as martyRealName,c.unit as unit, c.real_name as real_name, c.nick_name as nickName FROM tb_mourn a left join tb_martyr b on b.id=a.martyr_id left join sys_user c on c.id=a.user_id  " +
+            "where a.is_delete = '0'  AND a.id=#{id}")
+    MournVo mapperFindById(Long id);
 }

gis_cms/src/main/java/com/gis/cms/mapper/provider/CommentProvider.java

@@ -28,8 +28,8 @@ public class CommentProvider {
         if(!StringUtils.isAllBlank(searchKey)){
             searchKey = StringUtils.trim(searchKey);
             sql.append(" and (");
-            sql.append("  b.nick_name like '%").append(searchKey).append("%'");
-            sql.append(" or ( b.real_name like '%").append(searchKey).append("%' )");
+            sql.append("  a.content like '%").append(searchKey).append("%'");
+//            sql.append(" or ( b.real_name like '%").append(searchKey).append("%' )");
             sql.append(" )");
         }
 

gis_cms/src/main/java/com/gis/cms/service/MournService.java

@@ -19,7 +19,7 @@ public interface MournService extends IBaseService<MournEntity, Long> {
 
     Result remove(Long id);
 
-    Result<MournEntity> detail(Long id);
+    Result<MournVo> detail(Long id);
 
     Result<MournVo> search(PageDateDto param, Integer display);
 

gis_cms/src/main/java/com/gis/cms/service/impl/MournServiceImpl.java

@@ -93,8 +93,8 @@ public class MournServiceImpl extends IBaseServiceImpl<MournEntity, Long> implem
     }
 
     @Override
-    public Result<MournEntity> detail(Long id) {
-        MournEntity entity = this.findById(id);
+    public Result<MournVo> detail(Long id) {
+        MournVo entity = entityMapper.mapperFindById(id);
         if (entity == null) {
             return Result.failure("对象不存在");
         }