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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-12-27 10:00:01 +08:00
parent b4c934e3c6 96abf890b6
commit af256fad41
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -2984,6 +2984,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
try { try {
list = lcJdbcTemplate.queryForList(sb.toString()); list = lcJdbcTemplate.queryForList(sb.toString());
list = list.stream().map(index -> { list = list.stream().map(index -> {
logger.info("云资源使用信息信息：" + JSON.toJSONString(index));
switch (index.get("type").toString()) { // 根据类型填充其审核状态 switch (index.get("type").toString()) { // 根据类型填充其审核状态
case "云主机": case "云主机":
case "云数据库": case "云数据库":

4
renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
View File

@ -540,8 +540,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
if (params.get("pageSize") != null && StringUtils.isNumber(params.get("pageSize").toString())) { if (params.get("pageSize") != null && StringUtils.isNumber(params.get("pageSize").toString())) {
pageSize = Integer.parseInt(params.get("pageSize").toString()); pageSize = Integer.parseInt(params.get("pageSize").toString());
} }
ArrayList<Object> resultList = new ArrayList<>(); pageNum = (pageNum - 1) * pageSize;
resultList.addAll(sysUserDao.getApproverUnconfiguredDepartment(pageNum, pageSize)); ArrayList<Object> resultList = new ArrayList<>(sysUserDao.getApproverUnconfiguredDepartment(pageNum, pageSize));
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("total", sysUserDao.getApproverUnconfiguredDepartmentCount()); resultMap.put("total", sysUserDao.getApproverUnconfiguredDepartmentCount());

2
renren-admin/src/main/resources/logback-spring.xml
View File

@ -73,7 +73,7 @@
<appender-ref ref="FILE_INFO"/> <appender-ref ref="FILE_INFO"/>
</logger> </logger>
<logger name="org.springboot.sample" level="ERROR"/> <logger name="org.springboot.sample" level="ERROR"/>
<logger name="io.renren" level="ERROR"/> <logger name="io.renren" level="INFO"/>
</springProfile> </springProfile>
<root level="INFO"> <root level="INFO">

4
renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
View File

@ -41,8 +41,12 @@
( SELECT DISTINCT PROC_DEF_ID_, PROC_INST_ID_, ASSIGNEE_ FROM ACT_HI_TASKINST ) aht ( SELECT DISTINCT PROC_DEF_ID_, PROC_INST_ID_, ASSIGNEE_ FROM ACT_HI_TASKINST ) aht
LEFT JOIN ACT_HI_PROCINST ahp ON aht.PROC_INST_ID_ = ahp.PROC_INST_ID_ LEFT JOIN ACT_HI_PROCINST ahp ON aht.PROC_INST_ID_ = ahp.PROC_INST_ID_
LEFT JOIN ACT_RE_PROCDEF arp ON aht.PROC_DEF_ID_ = arp.ID_ LEFT JOIN ACT_RE_PROCDEF arp ON aht.PROC_DEF_ID_ = arp.ID_
LEFT JOIN sys_user su ON ahp.START_USER_ID_ = su.id
WHERE WHERE
aht.ASSIGNEE_ = #{userId} aht.ASSIGNEE_ = #{userId}
<if test="userName != null and userName != ''" >
and su.real_name like CONCAT('%', #{userName} ,'%')
</if>
<if test="processInstanceId != null"> <if test="processInstanceId != null">
and aht.PROC_INST_ID_ = #{processInstanceId} and aht.PROC_INST_ID_ = #{processInstanceId}
</if> </if>

2
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -1079,8 +1079,10 @@
taa.apply_price AS "applyPrice" taa.apply_price AS "applyPrice"
FROM FROM
t_ability_application taa t_ability_application taa
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
WHERE WHERE
1 = 1 1 = 1
AND tdr.del_flag = 0
AND taa.approve_status = '通过' UNION ALL AND taa.approve_status = '通过' UNION ALL
SELECT SELECT
tmb.apply_price AS "applyPrice" tmb.apply_price AS "applyPrice"