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-08-22 09:54:39 +08:00
parent 305183cf9f 28e28430f0
commit cad9bf4ae0
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java
View File

@ -262,7 +262,7 @@ public class AbilityCenterControllerV2 {
put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请
put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id
put("deptId", deptId); // 归属部门
put("id", applyFlag); //申请id
// put("id", applyFlag); //申请id
put("creator", user == null ? null : user.getId().toString()); // 创建人
put("userId", user == null ? null : user.getId().toString()); // 创建人
put("basic_facilities", basicFacilities); // 是否为基础设施

6
renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV3.java
View File

@ -94,7 +94,7 @@ public class AbilityCenterControllerV3 {
@PostMapping(value = "/applyAllApplication")
@ApiOperation("批量进行能力申请")
@LogOperation("批量进行能力申请")
public Result<List<ProcessInstanceDTO>> applyV2AllApplication(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
public Result<List<ProcessInstanceDTO>> applyV3AllApplication(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
// 仿照请求接口 /act/process/lastestPage
PageData<Map<String, Object>> page = actProcessService.page(params);
if (page.getTotal() <= 0) { //
@ -134,7 +134,7 @@ public class AbilityCenterControllerV3 {
@PostMapping(value = "/apply")
@ApiOperation("批量进行能力申请")
@LogOperation("批量进行能力申请")
public Result<List<ProcessInstanceDTO>> applyV2(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
public Result<List<ProcessInstanceDTO>> applyV3(@RequestBody TAbilityBatchApplicationDTO abilityBatchApplicationDTO) {
// 仿照请求接口 /act/process/lastestPage
PageData<Map<String, Object>> page = actProcessService.page(params);
if (page.getTotal() <= 0) { //
@ -297,7 +297,7 @@ public class AbilityCenterControllerV3 {
put("tAbilityApplicationDTOList", dtoList); // 归属该部门的申请
put("key", processStartDTO.getBusinessKey()); // 归属该部门申请的表单id
put("deptId", deptId); // 归属部门
put("id", applyFlag); //申请id
// put("id", applyFlag); //申请id
put("creator", user == null ? null : user.getId().toString()); // 创建人
put("userId", user == null ? null : user.getId().toString()); // 创建人
put("userDeptId", user == null ? null : user.getDeptId().toString()); // 发起人部门id

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

@ -1631,7 +1631,8 @@
</select>
<select id="getImgServices" resultType="java.util.Map">
with A as
SELECT A.*,IFNULL(c.attr_value,'') as link
FROM
(
SELECT m.* FROM
(
@ -1641,9 +1642,12 @@
) m
INNER JOIN tb_data_attr b ON m.id = b.data_resource_id
AND b.attr_type = '分类' AND LOCATE(#{type},b.attr_value) AND b.del_flag = 0
)
SELECT A.*,IFNULL(c.attr_value,'') as link FROM A LEFT JOIN tb_data_attr c ON A.id = c.data_resource_id
AND c.attr_type = '图层缩略图' AND c.del_flag = 0
) A
LEFT JOIN tb_data_attr c
ON A.id = c.data_resource_id
AND c.attr_type = '图层缩略图'
AND c.del_flag = 0
</select>
<select id="cimAssemblyResources" resultType="java.util.Map">