diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java b/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java index 5dbd9168..0ffd437b 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java @@ -69,7 +69,14 @@ public class CommonController // String downloadPath = localPath + StringUtils.substringAfter(fileName, Constants.RESOURCE_PREFIX); String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = JianweiConfig.getDownloadPath() + fileName; + + String[] parts = fileName.split("/"); + StringBuilder desiredPath = new StringBuilder("/"); + for (int i = 2; i < parts.length; i++) { + desiredPath.append(parts[i]).append("/"); + } + desiredPath.deleteCharAt(desiredPath.length() - 1); + String filePath = JianweiConfig.getDownloadPath() + desiredPath.toString(); // // 下载名称 // String downloadName = StringUtils.substringAfterLast(downloadPath, "/"); diff --git a/jwtech-framework/src/main/java/com/jianwei/common/config/JianweiConfig.java b/jwtech-framework/src/main/java/com/jianwei/common/config/JianweiConfig.java index c474a844..5d8223d4 100644 --- a/jwtech-framework/src/main/java/com/jianwei/common/config/JianweiConfig.java +++ b/jwtech-framework/src/main/java/com/jianwei/common/config/JianweiConfig.java @@ -148,7 +148,7 @@ public class JianweiConfig */ public static String getDownloadPath() { - return getProfile() + "/download/"; + return getProfile() ; } /** diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java index ad875385..9088f622 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java @@ -49,7 +49,7 @@ import com.kms.enterprise.service.BsSgcYxjdEnterpriseInfoService; * @date 2024-01-03 */ @RestController -@RequestMapping("/enterprise/enterpriseInfo") +@RequestMapping("enterprise/enterpriseInfo") @Api(tags = "企业基本信息") public class BsSgcYxjdEnterpriseInfoController extends BaseController { diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index 2dcf2b97..a202f8ee 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -85,24 +85,24 @@ 1=1 - AND unified_social_credit_code = ( - SELECT - IFNULL( sd.unified_social_credit_code,1) - FROM - sys_user su left join sys_dept sd on su.dept_id=sd.id - AND su.id=#{userId} LIMIT 1) + + + + + + and enterprise_name like concat('%',#{enterpriseName},'%') - - - + + and adcd like concat(#{adcd},'%') + and adcd like concat(#{queryAccd},'%') - + order by ${orderBy} desc