zhaowenxuan
2025-01-02 f78aea34f0cbdaba114723d6edadc3648669aa24
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -260,10 +260,14 @@
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
//        wrapper.eq(TjSampling::getIsPay,1);
//        if (isSignFor == 1)
//            wrapper.eq(TjSampling::getIsApply,0);
        wrapper.orderByDesc(TjSampling::getIsMerge);
        List<TjSampling> list = tjSamplingService.list(wrapper);
        if (list.isEmpty()){
            logger.info("jtNum ->{}",tjNumber);
//            return AjaxResult.error("未查询到数据,人员未缴费或没有未采样项目");
            return AjaxResult.error("参数错误,未查询到数据");
        }
//        for (TjSampling sampling : list) {