Browse Source

no message

dingxin 6 years ago
parent
commit
de3db34f03

+ 3
- 3
CODE/smart-community/app-api/src/main/resources/mapper/TpActivityMapper.xml View File

269
       AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
269
       AND a.activity_title LIKE concat('%',#{title,jdbcType=VARCHAR},'%')
270
     </if>
270
     </if>
271
   ORDER BY
271
   ORDER BY
272
-      a.sort,
273
-      a.activity_end_time,
274
-      a.update_date,
272
+      a.sort DESC,
273
+      a.activity_end_time DESC,
274
+      a.update_date DESC,
275
 	  a.create_date DESC
275
 	  a.create_date DESC
276
   </select>
276
   </select>
277
 
277
 

+ 2
- 2
CODE/smart-community/app-api/src/main/resources/mapper/TpAnnouncementMapper.xml View File

175
         and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
175
         and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
176
       </if>
176
       </if>
177
   ORDER BY
177
   ORDER BY
178
-      a.sort,
179
-      a.update_date,
178
+      a.sort DESC,
179
+      a.update_date DESC,
180
       a.create_date DESC
180
       a.create_date DESC
181
   </select>
181
   </select>
182
 
182
 

+ 3
- 3
CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml View File

214
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
214
       and transaction_title LIKE concat('%',#{transactionTitle,jdbcType=VARCHAR},'%')
215
     </if>
215
     </if>
216
     and status = 1
216
     and status = 1
217
-    order by update_date, create_date DESC
217
+    order by update_date DESC, create_date DESC
218
   </select>
218
   </select>
219
 
219
 
220
   <select id="selectTransaction" resultMap="BaseResultMap">
220
   <select id="selectTransaction" resultMap="BaseResultMap">
227
       and type = #{type,jdbcType=INTEGER}
227
       and type = #{type,jdbcType=INTEGER}
228
     </if>
228
     </if>
229
     and status = 1
229
     and status = 1
230
-    order by update_date, create_date DESC
230
+    order by update_date DESC, create_date DESC
231
   </select>
231
   </select>
232
 
232
 
233
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
233
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >
249
   </select>
249
   </select>
250
 
250
 
251
   <select id="getReportReasons" resultType="java.util.Map">
251
   <select id="getReportReasons" resultType="java.util.Map">
252
-    SELECT id,reason FROM sys_report_reason ORDER BY sort,update_date DESC
252
+    SELECT id,reason FROM sys_report_reason ORDER BY sort
253
   </select>
253
   </select>
254
 
254
 
255
   <insert id="saveReportReason">
255
   <insert id="saveReportReason">

+ 5
- 6
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java View File

216
         int row = tpActivityMapper.updateById(selectTpActivity);
216
         int row = tpActivityMapper.updateById(selectTpActivity);
217
 
217
 
218
         // 先将原图删除!
218
         // 先将原图删除!
219
-        if (contentImgArray.length > 0) {
220
-            QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
221
-            queryWrapper.eq("uuid", tpActivity.getId());
222
-            queryWrapper.eq("type", "activity");
223
-            tdImagesMapper.delete(queryWrapper);
224
-        }
219
+         QueryWrapper<TdImages> queryWrapper = new QueryWrapper<>();
220
+         queryWrapper.eq("uuid", tpActivity.getId());
221
+         queryWrapper.eq("type", "activity");
222
+         tdImagesMapper.delete(queryWrapper);
223
+
225
 
224
 
226
         // 插入图片
225
         // 插入图片
227
         insertImg(contentImgArray, userElement, tpActivity);
226
         insertImg(contentImgArray, userElement, tpActivity);