songyh 3 лет назад
Родитель
Сommit
4bcdcb6119

+ 1 - 0
src/main/java/cn/com/ctop/okr/mapper/xml/OkrObjectInfoMapper.xml

@@ -119,6 +119,7 @@
         <if test="name != null and name != '' ">
         <if test="name != null and name != '' ">
             and user.name like concat('%',#{name},'%')
             and user.name like concat('%',#{name},'%')
         </if>
         </if>
+        order by objectInfo.id
         limit #{startIndex},#{pageSize}
         limit #{startIndex},#{pageSize}
     </select>
     </select>
 
 

+ 0 - 1
src/main/java/cn/com/ctop/okr/service/impl/OkrServiceImpl.java

@@ -668,7 +668,6 @@ public class OkrServiceImpl implements OkrService {
         //状态信息
         //状态信息
         List<OkrContentStatus> contentStatusList = okrContentStatusMapper.getContentStatusList(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
         List<OkrContentStatus> contentStatusList = okrContentStatusMapper.getContentStatusList(objectInfo.getUserId(), objectInfo.getYear(), objectInfo.getQuarter());
 
 
-
         result.put("taskInfoList",transformTaskInfo(setTaskList, 1));
         result.put("taskInfoList",transformTaskInfo(setTaskList, 1));
         result.put("taskFourWeekList",transformTaskInfo(settaskFourWeekList, 2));
         result.put("taskFourWeekList",transformTaskInfo(settaskFourWeekList, 2));
         result.put("okr",okrList);
         result.put("okr",okrList);