diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/order/TsoOrderController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/order/TsoOrderController.java index 4bc22a6..ad8f1e7 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/order/TsoOrderController.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/order/TsoOrderController.java @@ -87,7 +87,7 @@ public class TsoOrderController { respPageResult.getList().forEach(item -> { AdminUserDO userEntity = userService.getUser(item.getSaleMan()); if (userEntity != null) { - item.setSaleManName(userEntity.getUsername()); + item.setSaleManName(userEntity.getNickname()); } }); } diff --git a/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/framework/security/config/SecurityConfiguration.java b/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/framework/security/config/SecurityConfiguration.java index 01ce55f..f0b5358 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/framework/security/config/SecurityConfiguration.java +++ b/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/framework/security/config/SecurityConfiguration.java @@ -39,6 +39,10 @@ public class SecurityConfiguration { .antMatchers(adminSeverContextPath + "/**").anonymous(); // 文件读取 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); + + registry.antMatchers(buildAdminApi("/infra/file/upload")).permitAll(); + registry.antMatchers(buildAdminApi("/infra/file/uploadBatch")).permitAll(); + registry.antMatchers(buildAdminApi("/infra/file/uploadWatch")).permitAll(); } }; diff --git a/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/service/logger/ApiAccessLogServiceImpl.java b/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/service/logger/ApiAccessLogServiceImpl.java index baa44d1..0768352 100644 --- a/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/service/logger/ApiAccessLogServiceImpl.java +++ b/mes-module-infra/mes-module-infra-biz/src/main/java/com/ningxia/yunxi/chemmes/module/infra/service/logger/ApiAccessLogServiceImpl.java @@ -2,9 +2,10 @@ package com.ningxia.yunxi.chemmes.module.infra.service.logger; import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult; import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils; +import com.ningxia.yunxi.chemmes.framework.tenant.core.aop.TenantIgnore; import com.ningxia.yunxi.chemmes.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import com.ningxia.yunxi.chemmes.module.infra.dal.dataobject.logger.ApiAccessLogDO; import com.ningxia.yunxi.chemmes.module.infra.controller.admin.logger.vo.apiaccesslog.ApiAccessLogPageReqVO; +import com.ningxia.yunxi.chemmes.module.infra.dal.dataobject.logger.ApiAccessLogDO; import com.ningxia.yunxi.chemmes.module.infra.dal.mysql.logger.ApiAccessLogMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,6 +28,7 @@ public class ApiAccessLogServiceImpl implements ApiAccessLogService { private ApiAccessLogMapper apiAccessLogMapper; @Override + @TenantIgnore public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { ApiAccessLogDO apiAccessLog = BeanUtils.toBean(createDTO, ApiAccessLogDO.class); if (apiAccessLog.getResultMsg().length()>200){ diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/tsoorder/OrderForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/tsoorder/OrderForm.vue index ea9fe21..268ef07 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/tsoorder/OrderForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/tsoorder/OrderForm.vue @@ -217,6 +217,7 @@