Browse Source

* bug修复

顾绍勇 5 years ago
parent
commit
71e708d272

+ 2
- 1
src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java View File

148
 
148
 
149
         ResponseBean responseBean = new ResponseBean();
149
         ResponseBean responseBean = new ResponseBean();
150
         try {
150
         try {
151
+            orderRequestBO.setOrgId(getOrgId(request));
151
             responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, pageNumber, pageSize);
152
             responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, pageNumber, pageSize);
152
             logger.info("TaRaiseRecordController.listOrderByCondition 返回:{}", JSONObject.toJSONString(responseBean));
153
             logger.info("TaRaiseRecordController.listOrderByCondition 返回:{}", JSONObject.toJSONString(responseBean));
153
         } catch (Exception e) {
154
         } catch (Exception e) {
309
      * 批量线下退费
310
      * 批量线下退费
310
      *
311
      *
311
      * @param raiseRecord
312
      * @param raiseRecord
312
-     * @param refundReason    退款原因
313
+     * @param refundReason 退款原因
313
      * @return
314
      * @return
314
      */
315
      */
315
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)
316
     @RequestMapping(value = "/admin/batchRefundOfflineRaiseRecord", method = RequestMethod.PUT)

+ 1
- 1
src/main/resources/mapper/TaHousingResourcesMapper.xml View File

359
             t.org_id = #{orgId}
359
             t.org_id = #{orgId}
360
             AND t.`status` != - 1
360
             AND t.`status` != - 1
361
             AND t2.raise_record_id = #{raiseRecordId}
361
             AND t2.raise_record_id = #{raiseRecordId}
362
-        GROUP BY
362
+        ORDER BY
363
             t.create_date DESC
363
             t.create_date DESC
364
     </select>
364
     </select>
365
 
365
 

+ 2
- 0
src/main/resources/mapper/TaRaiseRecordMapper.xml View File

47
         <if test="bo.houseId != null">
47
         <if test="bo.houseId != null">
48
             AND t.house_id = #{bo.houseId}
48
             AND t.house_id = #{bo.houseId}
49
         </if>
49
         </if>
50
+        GROUP BY
51
+          t.house_id
50
         ORDER BY
52
         ORDER BY
51
           t3.create_date DESC
53
           t3.create_date DESC
52
     </select>
54
     </select>