合并

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

@@ -176,7 +176,7 @@ public class TpShopServicelmpl implements TpShopServicel {
         TpShopAppraisal tpShopAppraisal= JSONObject.parseObject(paramets,TpShopAppraisal.class);
 
         tpShopAppraisal.setCommunityId(userElement.getCommunityId());
-        tpShopAppraisal.setAppraisalPeople(userElement.getId()+"");
+        tpShopAppraisal.setAppraisalPeople(userElement.getUserName());
         tpShopAppraisal.setAppraisalTel(userElement.getLoginName());
         String photo = taUserMapper.selectByPrimaryKey(userElement.getId()).getHeadPortrait();
         tpShopAppraisal.setAppraisalAvatar(photo);

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

@@ -343,15 +343,16 @@
 
             <if test="ManageStatus == 1">
                 and is_reported = 1
+                and status = 1
             </if>
             <if test="ManageStatus == 2">
                 and  (read_status IS NULL or read_status = 0)
+                and status = 1
             </if>
             <if test="ManageStatus == 3">
                 and  read_status= 1
             </if>
             and community_id=#{communityId,jdbcType=INTEGER}
-            and status = 1
         </where>
 
     </select>

VUECODE/smart-property-manage/src/views/shop/shopReplay/index.vue

@@ -204,6 +204,8 @@ export default {
       this.dataQuery()
     },
     search() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
       this.dataQuery()
     },
     handleSelectionChange(data) {