修改了对应代码

fei

6 天以前 5de5db24efe1b25896c37f395124a207584bcb38

 archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java

@@ -133,9 +133,29 @@
//                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
//                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
//        lqw.orderByDesc(ZfProperty::getCreateTime);
        if(userId==1)
        if(archiveRecords.getOrderByColumn()==null) {
            if (userId == 1)

            lqw.orderByDesc(ArchiveRecords::getCreateTime);
                lqw.orderByDesc(ArchiveRecords::getCreateTime);
        }else
        {
            System.out.println(archiveRecords.getOrderByColumn());
            if("recordId".equals(archiveRecords.getOrderByColumn())) {
                if (archiveRecords.getIsAsc().equals("asc"))
                    lqw.orderByAsc(ArchiveRecords::getRecordId);
                else
                    lqw.orderByDesc(ArchiveRecords::getRecordId);
            }
            if("recordStatus".equals(archiveRecords.getOrderByColumn()))
            {
                if (archiveRecords.getIsAsc().equals("asc"))
                    lqw.orderByAsc(ArchiveRecords::getRecordStatus);
                else
                    lqw.orderByDesc(ArchiveRecords::getRecordStatus);
            }
        }
       // else
       //     lqw.eq(userId!=null, ArchiveRecords::getUserId, userId);
        System.out.println("ssssssssssssddd0000000000000000");
        return lqw;

@@ -163,8 +183,11 @@
        Page<ArchiveRecords> page = new Page<>(pageNum, pageSize);
    
    // 使用自定义的分页查询方法，先连接再分页
    Page<ArchiveRecords> pageResult = this.baseMapper.selectJoinUserPage(page, userid, lqw);

    Page<ArchiveRecords> pageResult = new Page<>();
    if(userid==1)
        pageResult = this.baseMapper.selectJoinUserPage(page, userid, lqw);
    else
        pageResult = this.baseMapper.selectJoinCommonUserPage(page, userid, lqw);

            //selectJoinUserPage(page, lqw);
    
@@ -175,11 +198,12 @@
     //   log.info("从数据库中查到的为:{}", beanRecords);
    //    return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);


        List<ArchiveRecords> beanUserRecords = new ArrayList<>();
        beanRecords.forEach(record ->{
            if(record.isArchiveRecordsId()!=null&&record.getUserId()==userid)
            {
                    record.setOwnData(true);
                    beanUserRecords.add(record);
            }
            else
                record.setOwnData(false);
@@ -187,7 +211,11 @@
        //不是管理员进行排序
       // if(userid != 1)
       //    Collections.sort(beanRecords, Comparator.comparing(ArchiveRecords::isOwnData));
        HashMap<String, Object> data = MapUtils.getResult(pageResult, beanRecords);
        HashMap<String, Object> data = new HashMap<>();
        if(userid==1)
            data = MapUtils.getResult(pageResult, beanRecords);
        else
            data = MapUtils.getResult(pageResult, beanUserRecords); 
//        System.out.println(data.get("data"));
//        System.out.println(data.get("pageNum"));
//        System.out.println(data.get("total"));
@@ -376,19 +404,24 @@

    @Override
    public int updateArchiveById(String status, Long id) {
        LocalDateTime time = LocalDateTime.now();

        Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
        // 获取当前用户ID
        Long userId = SecurityUtils.getUserId();
        // 可以在这里使用userId进行授权操作
        archiverecordstouserService.deleteArchiverecordstouserByRecordId(id, userId);
        this.baseMapper.updateStatusById(status, id);
        this.baseMapper.updateStatusById(status, id, date);
        return 0;
    }

    @Override
    public int updateStatusByIds(Long[] ids) {
        LocalDateTime time = LocalDateTime.now();

        Date date = Date.from(time.atZone(ZoneId.systemDefault()).toInstant());
        for(Long id : ids)
            this.baseMapper.updateStatusById("录入完成",id);
            this.baseMapper.updateStatusById("录入完成",id, date);
        return 0;
    }

@@ -408,7 +441,7 @@
        LambdaQueryWrapper<ArchiveRecords> lqw = new LambdaQueryWrapper<>();
        lqw.eq(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId,archiveRecords.getRecordId());
        List<ArchiveRecords> list = list(lqw);
        if (list.size() > 0) {
        if (!list.isEmpty()) {
          //  throw new RuntimeException("请勿新增重复数据");
            //如果有重复数据，则根据recordId进行数据修改
         //   if()