diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java index 9b8ec0da6..cd54935e5 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java @@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -50,8 +51,8 @@ public class AssemblyConfigController { @GetMapping("/list") @Operation(summary = "查询组织装配设置列表") @PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')") - public CommonResult> getAssemblyConfigList() { - return CommonResult.success(assemblyConfigService.getOrgAssemblyConfigList()); + public CommonResult> getAssemblyConfigList(@RequestParam("name") String name) { + return CommonResult.success(assemblyConfigService.getOrgAssemblyConfigList(name)); } @GetMapping("/{configId}") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigService.java index 4418ce35d..dddcb39a3 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigService.java @@ -26,7 +26,7 @@ public interface AssemblyConfigService { * * @return */ - List getOrgAssemblyConfigList(); + List getOrgAssemblyConfigList(String name); /** * 获取装配设置 diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java index d05edc094..2d683457b 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java @@ -12,6 +12,7 @@ import com.cf.imes.framework.common.exception.ServiceException; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.json.JsonUtils; +import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.mybatis.core.query.LambdaUpdateWrapperX; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.api.ordercomponent.OrderComponentApi; @@ -227,12 +228,13 @@ public class AssemblyConfigServiceImpl implements AssemblyConfigService { } @Override - public List getOrgAssemblyConfigList() { + public List getOrgAssemblyConfigList(String name) { Long organId = SecurityFrameworkUtils.getUserOrganId(); List list = assemblyConfigMapper.selectList( - new LambdaQueryWrapper() + new LambdaQueryWrapperX() .eq(AssemblyConfigDO::getOrganId, organId) + .likeIfPresent(AssemblyConfigDO::getComponentName, name) .eq(AssemblyConfigDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus()) .select(AssemblyConfigDO::getId, AssemblyConfigDO::getComponentName, AssemblyConfigDO::getStatus, AssemblyConfigDO::getSourceComponentId) );