Merge branch '1.3.x'

Author: CodeCasterX

store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml

@@ -92,7 +92,6 @@
     </sql>
     <sql id="sortAndLimit">
         order by
-        i.creator = 'system' desc,
         i."updated_time" desc
         <if test="offset != null and offset >= 0">
             offset #{offset}

store/plugins/store-repository-postgresql/src/test/java/modelengine/jade/store/repository/pgsql/integration/AppIntegrationTest.java

@@ -121,7 +121,7 @@ void shouldOkWhenGetApps() {
         when(this.domainDivisionService.getUserGroupId()).thenReturn("g1");
         ListResult<AppPublishData> apps = this.appService.getApps(appQuery);
         assertThat(apps.getCount()).isEqualTo(2);
-        assertThat(apps.getData().get(1).getTags()).isEqualTo(new HashSet<>(Arrays.asList("HUGGINGFACE", "FIT")));
+        assertThat(apps.getData().get(1).getTags()).isEqualTo(new HashSet<>(Arrays.asList("HUGGINGFACE")));
     }
 
     @Test

store/plugins/store-repository-postgresql/src/test/java/modelengine/jade/store/repository/pgsql/mapper/AppMapperTest.java

@@ -40,7 +40,7 @@ void shouldReturnSystemCreatedAppFirst() {
         List<AppDo> result = this.appMapper.getApps(appQuery);
 
         assertThat(result).hasSize(2);
-        assertThat(result.get(0).getCreator()).isEqualTo("system");
-        assertThat(result.get(1).getCreator()).isEqualTo("Jade");
+        assertThat(result.get(0).getCreator()).isEqualTo("Jade");
+        assertThat(result.get(1).getCreator()).isEqualTo("system");
     }
 }