Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1563修复

Browse Source
This commit is contained in:
gaoqr
2026-05-22 16:30:49 +08:00
parent 88561efda7
commit d449e26bc6
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/assemblyconfig/AssemblyConfigController.java
+3 -2
View File
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@@ -50,8 +51,8 @@ public class AssemblyConfigController {
@GetMapping("/list") @GetMapping("/list")
@Operation(summary = "查询组织装配设置列表") @Operation(summary = "查询组织装配设置列表")
@PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')") @PreAuthorize("@ss.hasPermission('systemconfig:assemblyconfig:query')")
public CommonResult<List<AssemblyConfigListRespVO>> getAssemblyConfigList() { public CommonResult<List<AssemblyConfigListRespVO>> getAssemblyConfigList(@RequestParam("name") String name) {
return CommonResult.success(assemblyConfigService.getOrgAssemblyConfigList()); return CommonResult.success(assemblyConfigService.getOrgAssemblyConfigList(name));
} }
@GetMapping("/{configId}") @GetMapping("/{configId}")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigService.java
+1 -1
View File
@@ -26,7 +26,7 @@ public interface AssemblyConfigService {
* *
* @return * @return
*/ */
List<AssemblyConfigListRespVO> getOrgAssemblyConfigList(); List<AssemblyConfigListRespVO> getOrgAssemblyConfigList(String name);
/** /**
* 获取装配设置 * 获取装配设置
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/assemblyconfig/AssemblyConfigServiceImpl.java
+4 -2
View File
@@ -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.pojo.CommonResult;
import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.common.util.Assert.AssertUtils;
import com.cf.imes.framework.common.util.json.JsonUtils; 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.mybatis.core.query.LambdaUpdateWrapperX;
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
import com.cf.imes.module.executor.api.ordercomponent.OrderComponentApi; import com.cf.imes.module.executor.api.ordercomponent.OrderComponentApi;
@@ -227,12 +228,13 @@ public class AssemblyConfigServiceImpl implements AssemblyConfigService {
} }
@Override @Override
public List<AssemblyConfigListRespVO> getOrgAssemblyConfigList() { public List<AssemblyConfigListRespVO> getOrgAssemblyConfigList(String name) {
Long organId = SecurityFrameworkUtils.getUserOrganId(); Long organId = SecurityFrameworkUtils.getUserOrganId();
List<AssemblyConfigDO> list = assemblyConfigMapper.selectList( List<AssemblyConfigDO> list = assemblyConfigMapper.selectList(
new LambdaQueryWrapper<AssemblyConfigDO>() new LambdaQueryWrapperX<AssemblyConfigDO>()
.eq(AssemblyConfigDO::getOrganId, organId) .eq(AssemblyConfigDO::getOrganId, organId)
.likeIfPresent(AssemblyConfigDO::getComponentName, name)
.eq(AssemblyConfigDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus()) .eq(AssemblyConfigDO::getDeleted, DeletedCodeEnum.NOT_DELETED.getStatus())
.select(AssemblyConfigDO::getId, AssemblyConfigDO::getComponentName, AssemblyConfigDO::getStatus, AssemblyConfigDO::getSourceComponentId) .select(AssemblyConfigDO::getId, AssemblyConfigDO::getComponentName, AssemblyConfigDO::getStatus, AssemblyConfigDO::getSourceComponentId)
); );