jz.kai 1 jaar geleden
bovenliggende
commit
94503b73f8

+ 4 - 0
common/src/main/java/com/jpsoft/employment/modules/base/entity/MessageBoard.java

@@ -83,5 +83,9 @@ public class MessageBoard {
 	@Transient
 	@ApiModelProperty(value = "回复人姓名")
 	private String replyName;
+
+	@Transient
+	@ApiModelProperty(value = "头像")
+	private String headImg;
 	
 		}

+ 8 - 4
common/src/main/resources/mapper/base/MessageBoard.xml

@@ -19,6 +19,8 @@
 			<result property="updateBy" column="update_by" />
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
+
+		<result property="headImg" column="head_img" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.MessageBoard">
 	<!--
@@ -120,10 +122,12 @@
 				and b.real_name like #{searchParams.name}
 			</if>
 			<if test="searchParams.status != null">
-				and a.status_ = #{searchParams.status}
-			</if>
-			<if test="searchParams.regUserId != null">
-				or a.reg_user_id = #{searchParams.regUserId}
+				<if test="searchParams.regUserId == null">
+					and a.status_ = #{searchParams.status}
+				</if>
+				<if test="searchParams.regUserId != null">
+					and (a.status_ = #{searchParams.status} or a.reg_user_id = #{searchParams.regUserId})
+				</if>
 			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">

+ 18 - 0
web/src/main/java/com/jpsoft/employment/modules/base/api/BoardApi.java

@@ -104,4 +104,22 @@ public class BoardApi {
 
         return msgResult;
     }
+
+    @ApiOperation(value="删除")
+    @RequestMapping(value = "delete",method = RequestMethod.POST)
+    public MessageResult delete(String id, HttpServletRequest request) {
+        MessageResult msgResult = new MessageResult<>();
+        String subject = (String)request.getAttribute("subject");
+
+        MessageBoard messageBoard = messageBoardService.get(id);
+        messageBoard.setDelFlag(true);
+        messageBoard.setUpdateBy(subject);
+        messageBoard.setUpdateTime(new Date());
+        messageBoardService.update(messageBoard);
+
+        msgResult.setResult(true);
+        msgResult.setData(messageBoard);
+
+        return msgResult;
+    }
 }