修改了个人模块几个模块可以共享数据了

feige

2025-06-23 082ba3d3cd975f182425448bcea3a9166b70980b

 zhang-content/src/main/java/com/ruoyi/service/impl/ZHonorServiceImpl.java

@@ -11,8 +11,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZHonor;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZSecret;
import com.ruoyi.mapper.ZHonorMapper;
import com.ruoyi.service.ZHonorService;
import com.ruoyi.service.ZInfoUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,6 +26,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -38,6 +42,8 @@
    @Autowired
    ZHonorServiceImpl zHonorService;

    @Autowired
    ZInfoUserService zInfoUserService;
    @Resource
    ZHonorMapper zHonorMapper;

@@ -67,7 +73,19 @@
                .orderByDesc(ZHonor::getCreateTime);
        return lqw;
    }
    private LambdaQueryWrapper<ZHonor> buildConditionSec(ZHonor zHonor,List<Long> userIds){
        LambdaQueryWrapper<ZHonor> lqw = new LambdaQueryWrapper<>();

                lqw.in(ZHonor::getUserId, userIds)
                .eq(StringUtils.isNotEmpty(zHonor.getName()),ZHonor::getName,zHonor.getName())
                .like(zHonor.getType()!=null,ZHonor::getType,zHonor.getType())
                .like(StringUtils.isNotEmpty(zHonor.getIdNo()),ZHonor::getIdNo,zHonor.getIdNo())
                .like(StringUtils.isNotEmpty(zHonor.getGrade()),ZHonor::getGrade,zHonor.getGrade())
                .like(StringUtils.isNotEmpty(zHonor.getLocation()),ZHonor::getLocation,zHonor.getLocation())
                .like(StringUtils.isNotEmpty(zHonor.getRemark()),ZHonor::getRemark,zHonor.getRemark())
                .orderByDesc(ZHonor::getCreateTime);
        return lqw;
    }
    /**
     * 分页查找
     */
@@ -75,7 +93,20 @@
    public AjaxResult selectDataList(ZHonor zHonor,Integer pageNum,Integer pageSize) {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        LambdaQueryWrapper<ZHonor> lqw = buildCondition(zHonor, userId);



        //根据userId查询到infouser的uaid
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        //拿到所有的sysid
        List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZHonor> lqw;
        if(!fms.isEmpty())
            lqw = buildConditionSec(zHonor, fms);
        else
            lqw = buildCondition(zHonor, userId);

      //  LambdaQueryWrapper<ZHonor> lqw = buildCondition(zHonor, userId);

        Page<ZHonor> pageBean = new Page<>(pageNum, pageSize);
        Page<ZHonor> pageResult = page(pageBean, lqw);