wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-10-18 17:21:48 +08:00
parent dd63b8db3d d7f8bf7656
commit 3dde0b314d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java
View File

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

2
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1711,7 +1711,7 @@
a.dept_id = #{deptid} a.dept_id = #{deptid}
AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE) AND MATCH (a.type) AGAINST ( '组件服务' IN BOOLEAN MODE)
AND a.del_flag = 0 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 AND b.del_flag = 0
</select> </select>