Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-18 17:21:48 +08:00
commit 3dde0b314d
2 changed files with 3 additions and 3 deletions

View File

@ -55,8 +55,8 @@ public class CIMController {
}
@GetMapping("/cimAssemblyResources")
@ApiOperation("CIM平台查询智能算法组件")
@LogOperation(value = "CIM平台查询智能算法组件")
@ApiOperation("CIM平台查询开发组件")
@LogOperation(value = "CIM平台查询开发组件")
public Result<List<Map>> cimAssemblyResources() {
return new Result<List<Map>>().ok(cimService.cimAssemblyResources());
}

View File

@ -1711,7 +1711,7 @@
a.dept_id = #{deptid}
AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
AND a.del_flag = 0
AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '智能算法' IN BOOLEAN MODE))
AND (b.attr_type = '组件类型' AND MATCH (b.attr_value) AGAINST ( '开发组件' IN BOOLEAN MODE))
AND b.del_flag = 0
</select>