Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabProjectItemMapper.java

 package com.gic.enterprise.dao.mapper;
 
 import com.gic.enterprise.dto.ProjectItemDTO;
-import com.gic.enterprise.entity.TabProject;
 import com.gic.enterprise.entity.TabProjectItem;
 import com.gic.enterprise.qo.ProjectItemQO;
 import com.github.pagehelper.Page;
@@ -67,7 +66,7 @@ public interface TabProjectItemMapper {
 
     TabProjectItem getByProjectItemCode(@Param("projectItemCode") String projectItemCode);
 
-    List<TabProject> listTwoElementExceptId(@Param("start") int start, @Param("size") int size, @Param("projectItemId") Integer projectItemId);
+    List<TabProjectItem> listTwoElementExceptId(@Param("start") int start, @Param("size") int size, @Param("projectItemId") Integer projectItemId);
 
     Double getMinSort();
 

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/ProjectItemServiceImpl.java

@@ -4,7 +4,6 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.dao.mapper.TabProjectItemMapper;
 import com.gic.enterprise.dto.ProjectItemDTO;
-import com.gic.enterprise.entity.TabProject;
 import com.gic.enterprise.entity.TabProjectItem;
 import com.gic.enterprise.qo.ProjectItemQO;
 import com.gic.enterprise.service.ProjectItemService;
@@ -121,7 +120,7 @@ public class ProjectItemServiceImpl implements ProjectItemService {
             int start = seq - 2;
             int size = 2;
 
-            List<TabProject> list = tabProjectItemMapper.listTwoElementExceptId(start, size, projectItemId);
+            List<TabProjectItem> list = tabProjectItemMapper.listTwoElementExceptId(start, size, projectItemId);
             if (CollectionUtils.isEmpty(list)) {
                 // 置底
                 sortBottom(projectItemId);

gic-platform-enterprise-service/src/main/resources/mapper/TabProjectItemMapper.xml

@@ -236,7 +236,7 @@
       #{item}
     </foreach>
     </if>
-    order by create_time desc
+    order by sort
   </select>
   <select id="getProjectItemCountByProjectIds" resultType="java.util.HashMap">
     select