合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -333,7 +333,7 @@ public class SocialController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets);
+        ResponseBean response = socialServiceI.addAllTransaction(userId, paramets,userElement.getUserVerifyId());
         return response;
     }
     

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpTransaction.java

@@ -53,11 +53,36 @@ public class TpTransaction {
      */
     private Integer noLikeCount;
 
+    /**
+     * 对应app端的角色表，物业端发帖时不维护
+     */
+    private Integer taUserVerifyId;
+
+    /**
+     * 0为app端，1为物业
+     */
+    private String releaseIdentity;
+
+    public void setReleaseIdentity(String releaseIdentity) {
+        this.releaseIdentity = releaseIdentity;
+    }
+
+    public String getReleaseIdentity() {
+        return releaseIdentity;
+    }
+
     /**
      * 是否已点赞或者踩
      */
     private String bel;
 
+    public Integer getTaUserVerifyId() {
+        return taUserVerifyId;
+    }
+
+    public void setTaUserVerifyId(Integer taUserVerifyId) {
+        this.taUserVerifyId = taUserVerifyId;
+    }
 
     public String getRoleName() {
         return roleName;

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -108,7 +108,7 @@ public interface SocialServiceI {
 	/**
 	 * 添加二手租赁帖子
 	 */
-    ResponseBean addAllTransaction(Integer userId, String paramets)throws IOException;
+    ResponseBean addAllTransaction(Integer userId, String paramets, Integer userVerifyId)throws IOException;
 
 
 	/**

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -316,11 +316,12 @@ public class SocialServiceImpl implements SocialServiceI {
         List<TpTransaction> tpTransactions= tpTransactionMapper.findAllTransaction(communityId, transactionTitle,type);
 
         tpTransactions.stream().forEach(e->{
-            // 角色
-//            taUserVerifyMapper.selectByPrimaryKey()
-            TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserId());
-            e.setRoleId(taSysRole.getId());
-            e.setRoleName(taSysRole.getRoleName());
+
+            if (null != e.getTaUserVerifyId()){
+                TaSysRole taSysRole = taSysRoleMapper.findRoleByUserId(e.getTaUserVerifyId());
+                e.setRoleId(taSysRole.getId());
+                e.setRoleName(taSysRole.getRoleName());
+            }
             TaUser taUser = taUserMapper.selectByPrimaryKey(e.getTaUserId());
             e.setCreateUserName(taUser.getUserName());
         });
@@ -335,7 +336,7 @@ public class SocialServiceImpl implements SocialServiceI {
 
     @Transactional
     @Override
-    public ResponseBean addAllTransaction(Integer userId, String paramets) throws IOException {
+    public ResponseBean addAllTransaction(Integer userId, String paramets,Integer userVerifyId) throws IOException {
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(paramets);
         String transactionTitle = (String) jsonObject.get("title");
@@ -355,6 +356,7 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTransaction.setCreateDate(new Date());
         tpTransaction.setUpdateUser(userId);
         tpTransaction.setUpdateDate(new Date());
+        tpTransaction.setTaUserVerifyId(userVerifyId);
         tpTransaction.setIsReported("0");
 
         //判断身份是否为业主且状态为已停用

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -16,10 +16,13 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="role_id" property="roleId" jdbcType="INTEGER" />
     <result column="role_name" property="roleName" jdbcType="VARCHAR" />
+    <result column="ta_user_verify_id" property="taUserVerifyId" jdbcType="INTEGER" />
+    <result column="release_identity" property="releaseIdentity" jdbcType="VARCHAR" />
+
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, transaction_title, transaction_content,
-    view_count, status, type, create_user, create_date, update_user, update_date
+    view_count, status, type, create_user, create_date, update_user, update_date, ta_user_verify_id, release_identity
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.community.huiju.model.TpTransaction"  >
     SELECT
@@ -36,7 +39,9 @@
 	ttr.update_user,
 	ttr.update_date,
 	sr.id AS role_id,
-	sr.role_name AS role_name
+	sr.role_name AS role_name,
+	ttr.release_identity,
+	ttr.ta_user_verify_id
 FROM
 	tp_transaction ttr
 LEFT JOIN ta_sys_user_role tsur ON ttr.ta_user_id = tsur.user_id
@@ -48,12 +53,14 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpTransaction" >
-    insert into tp_transaction (id, community_id, ta_user_id, 
+    insert into tp_transaction (id, community_id,release_identity,
+      ta_user_verify_id，
+      ta_user_id,
       transaction_title, transaction_content,
       view_count, status,
       type, create_user, create_date, 
       update_user, update_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER},#{releaseIdentity,jdbcType=VARCHAR},#{taUserVerifyId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{transactionTitle,jdbcType=VARCHAR}, #{transactionContent,jdbcType=VARCHAR},
        #{viewCount,jdbcType=INTEGER}, #{status,jdbcType=CHAR},
       #{type,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
@@ -101,6 +108,12 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="taUserVerifyId != null" >
+        ta_user_verify_id,
+      </if>
+      <if test="releaseIdentity != null" >
+        release_identity
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -142,6 +155,12 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="taUserVerifyId != null" >
+        #{taUserVerifyId,jdbcType=INTEGER},
+      </if>
+      <if test="releaseIdentity != null" >
+        #{releaseIdentity,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpTransaction" >

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -146,7 +146,7 @@
     FROM
         tp_transaction_reply tr
     WHERE
-	tr.community_id = 45
+	tr.community_id = #{communityId}
       <if test="type != null and type != '' and type == 2" >
       AND (tr.reply_ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id )) OR (ta_user_id = (SELECT r.id from tp_user r WHERE tr.ta_user_id = r.id ))
       </if>