Commit 09c4fdd14aaae77574330368e5ecd7db5ddb762b
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml
View file @
09c4fdd
... | ... | @@ -23,7 +23,11 @@ |
23 | 23 | <if test="phone != null and phone != ''"> |
24 | 24 | and phone = #{phone,jdbcType=VARCHAR} |
25 | 25 | </if> |
26 | + <if test="sort != null and sort != '' "> | |
27 | + order by ${sort} | |
28 | + </if> | |
26 | 29 | </select> |
30 | + | |
27 | 31 | |
28 | 32 | <update id="updateAssistBuildUser" parameterType="com.lyms.platform.pojo.AssistBuildUserModel" > |
29 | 33 | UPDATE |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AssistBuildFacade.java
View file @
09c4fdd
... | ... | @@ -170,6 +170,7 @@ |
170 | 170 | |
171 | 171 | List result = new ArrayList(); |
172 | 172 | ArchiveDataQuery query = new ArchiveDataQuery(); |
173 | + query.setSort(" created desc "); | |
173 | 174 | List<AssistBuildUserModel> userModels = assistBuildService.queryAssistBuildUsers(param); |
174 | 175 | if (CollectionUtils.isNotEmpty(userModels)) { |
175 | 176 | AssistBuildUserModel model = userModels.get(0); |
... | ... | @@ -208,6 +209,7 @@ |
208 | 209 | |
209 | 210 | List result = new ArrayList(); |
210 | 211 | ArchiveDataQuery query = new ArchiveDataQuery(); |
212 | + query.setSort(" created desc "); | |
211 | 213 | List<AssistBuildUserModel> userModels = assistBuildService.queryAssistBuildUsers(param); |
212 | 214 | if (CollectionUtils.isNotEmpty(userModels)) { |
213 | 215 | AssistBuildUserModel model = userModels.get(0); |