diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java index efd7cc62..04db3308 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java @@ -67,9 +67,11 @@ public class SysDeptServiceImpl extends ServiceImpl i List returnList = new ArrayList<>(); for (SysDeptEntity t : list) { // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 - if (t.getParentId() == parentId) { - recursionFn(list, t); - returnList.add(t); + if(t.getParentId() != null) { + if (t.getParentId() == parentId) { + recursionFn(list, t); + returnList.add(t); + } } } return returnList; diff --git a/dxhy-admin/src/main/resources/bootstrap-std.yaml b/dxhy-admin/src/main/resources/bootstrap-std.yaml index 4d7a266b..6a748965 100644 --- a/dxhy-admin/src/main/resources/bootstrap-std.yaml +++ b/dxhy-admin/src/main/resources/bootstrap-std.yaml @@ -4,24 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 # Nacos config 分组 group: dxhy-admin-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: dxhy-admin # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + password: FaP!a0_NacOs + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java index 556225a2..56bb1184 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java @@ -261,7 +261,8 @@ public class ExcelController extends AbstractController { Map returnMap = new HashMap<>(2); returnMap.put("id",tdxExcelExprortlog.getId()); if("64".equals(serviceType)){ - returnMap.put("serviceType","3"); + returnMap.put("serviceType","2"); + returnMap.put("isPdf","1"); }else{ returnMap.put("serviceType","2"); } diff --git a/dxhy-core/src/main/resources/bootstrap-std.yaml b/dxhy-core/src/main/resources/bootstrap-std.yaml index c4522dab..7b344d4c 100644 --- a/dxhy-core/src/main/resources/bootstrap-std.yaml +++ b/dxhy-core/src/main/resources/bootstrap-std.yaml @@ -4,24 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 # Nacos config 分组 group: dxhy-core-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: dxhy-core # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + password: FaP!a0_NacOs + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file diff --git a/dxhy-erp/src/main/resources/bootstrap-std.yaml b/dxhy-erp/src/main/resources/bootstrap-std.yaml index 588bf1e1..fe00b993 100644 --- a/dxhy-erp/src/main/resources/bootstrap-std.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-std.yaml @@ -4,24 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 # Nacos config 分组 group: dxhy-erp-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: dxhy-erp # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + password: FaP!a0_NacOs + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file diff --git a/dxhy-gateway/src/main/resources/bootstrap-std.yaml b/dxhy-gateway/src/main/resources/bootstrap-std.yaml index 93d8103d..d8d46bdc 100644 --- a/dxhy-gateway/src/main/resources/bootstrap-std.yaml +++ b/dxhy-gateway/src/main/resources/bootstrap-std.yaml @@ -4,24 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 # Nacos config 分组 group: dxhy-gateway-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: dxhy-gateway # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + password: FaP!a0_NacOs + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file diff --git a/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml index 306a4294..469a8b96 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml +++ b/dxhy-operation-flow/src/main/resources/bootstrap-std.yaml @@ -4,24 +4,24 @@ spring: nacos: config: # Nacos config 地址 - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 命名空间,对应配置中的名称(dxhy-jxpt-namespace) - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 # Nacos config 分组 group: dxhy-flow-group # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # Nacos config 配置文件前缀 prefix: dxhy-flow # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.143:33000 + server-addr: nacos-1.itax.local:33000 # Nacos config 登录用户名 - username: admin + username: nacos # Nacos config 登录密码 - password: Invoice.nacos.!1 - namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file + password: FaP!a0_NacOs + namespace: 6d5c274e-cbe8-48bc-b912-8007e2c87e68 \ No newline at end of file