排序desc

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyFeeApprovalServiceImpl.java

@@ -161,7 +161,7 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
     @Override
     public List<SysAgencyFeeApprovalRecord> queryOperate(Integer id) {
         return sysAgencyFeeApprovalRecordMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApprovalRecord>()
-                .eq(SysAgencyFeeApprovalRecord::getApprovalId, id));
+                .eq(SysAgencyFeeApprovalRecord::getApprovalId, id).orderByDesc(SysAgencyFeeApprovalRecord::getId));
     }
 
 
@@ -171,7 +171,8 @@ public class SysAgencyFeeApprovalServiceImpl extends ServiceImpl<SysAgencyFeeApp
         List<SysAgencyFeeApproval> feeApprovalList = sysAgencyFeeApprovalMapper.selectList(new LambdaQueryWrapper<SysAgencyFeeApproval>()
                 .eq(SysAgencyFeeApproval::getUserId, BaseController.getUserId())
                 .ge(StringUtils.isNotEmpty(sysAgencyFeeApprovalDto.getBeginTime()), SysAgencyFeeApproval::getAuditTime,sysAgencyFeeApprovalDto.getBeginTime())
-                .le(StringUtils.isNotEmpty(sysAgencyFeeApprovalDto.getEndTime()),SysAgencyFeeApproval::getAuditTime,sysAgencyFeeApprovalDto.getEndTime()));
+                .le(StringUtils.isNotEmpty(sysAgencyFeeApprovalDto.getEndTime()),SysAgencyFeeApproval::getAuditTime,sysAgencyFeeApprovalDto.getEndTime())
+                .orderByDesc(SysAgencyFeeApproval::getId));
 
         return feeApprovalList;
     }

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -147,13 +147,15 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
             sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                     .eq(SysUser::getStatus, 1)
                     .likeRight(SysUser::getId, sysDept.getParentId())
-                    .notLike(SysUser::getId, "M"));
+                    .notLike(SysUser::getId, "M")
+                    .orderByDesc(SysUser::getCreateTime));
 
         } else {
             sysUserList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                     .eq(SysUser::getStatus, 1)
                     .likeRight(SysUser::getId, id)
-                    .notLike(SysUser::getId, "M"));
+                    .notLike(SysUser::getId, "M")
+                    .orderByDesc(SysUser::getCreateTime));
 
 
         }
@@ -324,7 +326,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         LambdaQueryWrapper<SysAgencyLeader> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SysAgencyLeader::getDelFlag, 1);
         wrapper.likeRight(!StringUtils.isNullOrEmpty(sysAgencyLeaderPageDto.getDeptId()), SysAgencyLeader::getDeptId, sysAgencyLeaderPageDto.getDeptId());
-        wrapper.orderByAsc(SysAgencyLeader::getId);
+        wrapper.orderByDesc(SysAgencyLeader::getId);
 
         Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
         List<SysAgencyLeader> records = insOrdersPage.getRecords();
@@ -552,6 +554,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserId()), SysAgencyLeader::getUserId, sysAgencyLeaderPageDto.getUserId());
         wrapper.like(StringUtils.isNotEmpty(sysAgencyLeaderPageDto.getUserName()), SysAgencyLeader::getUserName, sysAgencyLeaderPageDto.getUserName());
         wrapper.eq(SysAgencyLeader::getDelFlag, 1);
+        wrapper.orderByDesc(SysAgencyLeader::getId);
 
         Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
         List<SysAgencyLeader> records = insOrdersPage.getRecords();
@@ -647,8 +650,10 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
 
         LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
         wrapper.likeRight(SysDept::getId, sysAgencyLeaders.getDeptId())
-                .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0).eq(SysDept::getManagementSource, sysAgencyLeaders.getSource())
-                .like(StringUtils.isNotEmpty(teamInformationDto.getDeptName()), SysDept::getName, teamInformationDto.getDeptName());
+                .isNull(SysDept::getComlevel).eq(SysDept::getDelFlag, 0)
+                .eq(SysDept::getManagementSource, sysAgencyLeaders.getSource())
+                .like(StringUtils.isNotEmpty(teamInformationDto.getDeptName()), SysDept::getName, teamInformationDto.getDeptName())
+                .orderByDesc(SysDept::getCreateTime);
 
         Page<SysDept> insOrdersPage = sysDeptService.page(page, wrapper);
         List<SysDept> sysDeptList = insOrdersPage.getRecords();
@@ -753,6 +758,7 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
             wrapper.like(StringUtils.isNotEmpty(agencyTeamDto.getDeptName()), SysAgencyLeader::getDeptName, agencyTeamDto.getDeptName());
             wrapper.in(SysAgencyLeader::getUserId, ids);
             wrapper.eq(SysAgencyLeader::getDelFlag, 1);
+            wrapper.orderByDesc(SysAgencyLeader::getId);
 
             Page<SysAgencyLeader> insOrdersPage = page(page, wrapper);
             List<SysAgencyLeader> leaderList = insOrdersPage.getRecords();
@@ -848,7 +854,8 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
             //获取机构负责人信息
             List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>()
                     .in(SysAgencyLeader::getUserId, agencyLeaderIds)
-                    .eq(SysAgencyLeader::getDelFlag, 1));
+                    .eq(SysAgencyLeader::getDelFlag, 1)
+                    .orderByDesc(SysAgencyLeader::getId));
 
             return BeanUtil.copyToList(sysAgencyLeaders, SysAgencyLeaderVo.class);
         }
@@ -862,7 +869,9 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         List<TeamUserInfoVo> teamUserInfoVoList = new ArrayList<>();
         Page<SysUser> page = new Page<>(teamUserInfoDto.getPageNum(), teamUserInfoDto.getPageSize());
         LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.likeRight(SysUser::getId, teamUserInfoDto.getDeptId()).eq(SysUser::getStatus, 1);
+        wrapper.likeRight(SysUser::getId, teamUserInfoDto.getDeptId());
+        wrapper.eq(SysUser::getStatus, 1);
+        wrapper.orderByDesc(SysUser::getCreateTime);
 
         Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
         List<SysUser> sysUsers = insOrdersPage.getRecords();

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -16,7 +16,6 @@ import com.ydtech.modules.admin.model.dto.SysPartnerPageDto;
 import com.ydtech.modules.admin.model.vo.AgencyExtractFeeVo;
 import com.ydtech.modules.admin.model.vo.SysPartnerAPPPageVo;
 import com.ydtech.modules.admin.model.vo.SysUserPartner;
-import com.ydtech.modules.admin.model.vo.TeamInformation;
 import com.ydtech.modules.admin.service.SysPartnerService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
@@ -74,7 +73,8 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
     @Override
     public List<SysPartner> queryRecommendAndPartner(String id) {
-        return sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1).likeRight(SysPartner::getUserId, id));
+        return sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1)
+                .likeRight(SysPartner::getUserId, id).orderByDesc(SysPartner::getId));
     }
 
     @Override
@@ -104,20 +104,10 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         wrapper.notLike(SysUser::getId, "M");
         wrapper.notIn(CollectionUtil.isNotEmpty(stringList),SysUser::getId, stringList);
         wrapper.in(CollectionUtil.isNotEmpty(idList),SysUser::getDeptId, idList);
+        wrapper.orderByDesc(SysUser::getCreateTime);
 
         Page<SysUser> insOrdersPage = sysUserService.page(page, wrapper);
         List<SysUser> records = insOrdersPage.getRecords();
-//        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new LambdaQueryWrapper<SysAgencyLeader>().eq(SysAgencyLeader::getDelFlag, 1));
-//        if (sysAgencyLeaders.size()>0) {
-//            List<String> stringList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-//            records = records.stream().filter(SysUser -> !stringList.contains(SysUser.getId())).collect(Collectors.toList());
-//        }
-//        //查询所有四级部门
-//        List<SysDept> sysDeptList = sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getComlevel, 5));
-//        List<String> idList = sysDeptList.stream().map(SysDept::getId).collect(Collectors.toList());
-//        if (records.size()>0) {
-//            records = records.stream().filter(SysUser -> !idList.contains(SysUser.getId())).collect(Collectors.toList());
-//        }
 
         List<SysUserPartner> sysUserPartners = BeanUtil.copyToList(records, SysUserPartner.class);
 
@@ -248,7 +238,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         wrapper.eq(SysPartner::getDelFlag, 1);
         wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserId()), SysPartner::getUserId, sysPartnerPageDto.getUserId());
         wrapper.like(StringUtils.isNotEmpty(sysPartnerPageDto.getUserName()), SysPartner::getUserName, sysPartnerPageDto.getUserName());
-        wrapper.orderByAsc(SysPartner::getId);
+        wrapper.orderByDesc(SysPartner::getId);
 
         Page<SysPartner> insOrdersPage = page(page, wrapper);
         List<SysPartner> sysPartnerList = insOrdersPage.getRecords();
@@ -391,6 +381,7 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             wrapper.like(StringUtils.isNotEmpty(sysPartnerAPPPageDto.getUserName()), SysPartner::getUserName, sysPartnerAPPPageDto.getUserName());
             wrapper.in(SysPartner::getUserId, ids);
             wrapper.eq(SysPartner::getDelFlag, 1);
+            wrapper.orderByDesc(SysPartner::getId);
 
             Page<SysPartner> insOrdersPage = page(page, wrapper);
             List<SysPartner> sysPartnerList = insOrdersPage.getRecords();