修改接口

src/main/java/org/rcisoft/business/bdiscuss/dao/BDiscussRepository.java

@@ -45,9 +45,9 @@ public interface BDiscussRepository extends BaseMapper<BDiscuss> {
             " AND bd.del_flag = '0'  " +
             " AND bd.flag = '1' "
             + "<if test=\"lessonId !=null and lessonId != '' \">and bd.lesson_id = #{lessonId} </if> "
-            + "<if test=\"pid !=null and pid != '' \">and bd.pid = #{pid} </if> " +
+            + "and bd.pid = #{pid} " +
 
-//            "and corp_id = #{corpId} " +
+//            "and bd.corp_id = #{corpId} " +
 
             " order by bd.update_date desc "
             + "</script>")

src/main/java/org/rcisoft/business/bdiscuss/entity/BDiscuss.java

@@ -31,7 +31,7 @@ public class BDiscuss  extends IdEntity<BDiscuss> {
 
      private String studentId;
 
-     private String isReply;
+     private String replyId;
 
 
 }

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -221,11 +221,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @ResultMap(value = "BaseResultMap")
     SysUser queryUserState(@Param("userId")String userId);
 
-    @Select("<script>select `name` name ,head_pic headPic, `value` value from s_user where business_id = #{userId}" +
+    @Select("<script>select business_id id, `name` name  from s_user where business_id = #{userId}" +
             "</script>")
     MyInfoDTO queryMyInfo(CurUser curUser);
 
-    @Select("<script>select `name` name ,head_pic headPic, `value` value from s_user where business_id = #{id}" +
+    @Select("<script>select business_id id,`name` name ,head_pic headPic, `value` value from s_user where business_id = #{id}" +
             "</script>")
     MyInfoDTO getNameById(String id);
 

src/main/java/org/rcisoft/sys/user/dto/MyInfoDTO.java

@@ -6,6 +6,9 @@ import lombok.Data;
 @Data
 public class MyInfoDTO {
 
+    @ApiModelProperty(value = "用户Id")
+    private String id;
+
     @ApiModelProperty(value = "名称")
     private String name;
 

src/main/resources/mapper/business/bdiscuss/mapper/BDiscussMapper.xml

@@ -14,8 +14,9 @@
             <result column="pid" jdbcType="VARCHAR" property="pid"/>
             <result column="content" jdbcType="LONGVARCHAR" property="content"/>
             <result column="level" jdbcType="VARCHAR" property="level"/>
+            <result column="corp_id" jdbcType="VARCHAR" property="corpId"/>
             <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
-            <result column="is_reply" jdbcType="VARCHAR" property="isReply"/>
+            <result column="reply_id" jdbcType="VARCHAR" property="replyId"/>
     </resultMap>
 
         <resultMap id="BaseResultMapDto" type="org.rcisoft.business.bdiscuss.dto.BDiscussDto">
@@ -31,8 +32,9 @@
                 <result column="pid" jdbcType="VARCHAR" property="pid"/>
                 <result column="content" jdbcType="LONGVARCHAR" property="content"/>
                 <result column="level" jdbcType="VARCHAR" property="level"/>
+                <result column="corp_id" jdbcType="VARCHAR" property="corpId"/>
                 <result column="student_id" jdbcType="VARCHAR" property="studentId"/>
-                <result column="is_reply" jdbcType="VARCHAR" property="isReply"/>
+                <result column="reply_id" jdbcType="VARCHAR" property="replyId"/>
         </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->