Browse Source

提交代码

JX.Li 1 year ago
parent
commit
f793a7113f

+ 0 - 1
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -193,7 +193,6 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         result.getRecordsVo().forEach(item -> {
             if (StringUtils.isNotEmpty(item.getUserId()))
                 for (String uid : item.getUserId().split(",")) {
-                    System.out.println(uid);
                     GUserVo voById = gUserService.getVoById(uid);
                     if (ObjectUtils.isEmpty(voById))
                         continue;

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GBuildingServiceImpl.java

@@ -68,6 +68,7 @@ public class GBuildingServiceImpl extends ServicePlusImpl<GBuildingMapper, GBuil
         LambdaQueryWrapper<GBuilding> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), GBuilding::getName, bo.getName());
         lqw.eq(bo.getAreaId() != null, GBuilding::getAreaId, bo.getAreaId());
+        lqw.orderByDesc(GBuilding::getCreateTime);
         return lqw;
     }
 

+ 1 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -63,6 +63,7 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
         LambdaQueryWrapper<GUser> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), GUser::getName, bo.getName());
         lqw.like(bo.getJobNum() != null, GUser::getJobNum, bo.getJobNum());
+        lqw.orderByDesc(GUser::getCreateTime);
         return lqw;
     }
 

+ 1 - 0
ruoyi-gas/src/main/resources/mapper/GUnitMapper.xml

@@ -52,6 +52,7 @@
                 and a.building_id = #{p.buildingId}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
 </mapper>

+ 1 - 0
ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -39,6 +39,7 @@
                 and a.ranks = #{p.ranks}
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
     <select id="getWorker" resultType="com.ruoyi.gas.domain.vo.GUserForemanVo">