diff --git a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm index c73bd7c..98d8358 100644 --- a/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm +++ b/yudao-module-infra/src/main/resources/codegen/java/service/serviceImpl.vm @@ -1,6 +1,15 @@ package ${basePackage}.module.${table.moduleName}.service.${table.businessName}; import cn.hutool.core.collection.CollUtil; +#set ($hasSubJoinMany = false) +#foreach ($subTable in $subTables) +#if ( $subTable.subJoinMany ) +#set ($hasSubJoinMany = true) +#end +#end +#if ( $subTables && $subTables.size() > 0 && $table.templateType != 11 && $hasSubJoinMany ) +import cn.hutool.core.util.ObjectUtil; +#end import org.springframework.stereotype.Service; import ${jakartaPackage}.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_antd_general_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_antd_schema_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_ele_general_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vben5_ele_schema_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vue2_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vue2_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vue3_master_inner/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-infra/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl b/yudao-module-infra/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl index 2b485a4..31d689e 100644 --- a/yudao-module-infra/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl +++ b/yudao-module-infra/src/test/resources/codegen/vue3_master_normal/java/InfraStudentServiceImpl @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.infra.service.demo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ObjectUtil; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated;