Merge branch 'dev'

2.我的已办，上架申请列表查询增加申请人筛选条件
3.资金大屏总节约资金统计逻辑修改

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

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

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

@@ -540,8 +540,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         if (params.get("pageSize") != null && StringUtils.isNumber(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<>();
         resultMap.put("total", sysUserDao.getApproverUnconfiguredDepartmentCount());

renren-admin/src/main/resources/logback-spring.xml

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

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

@@ -41,8 +41,12 @@
             ( 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_RE_PROCDEF arp ON aht.PROC_DEF_ID_ = arp.ID_
+        LEFT JOIN sys_user su ON ahp.START_USER_ID_ = su.id
         WHERE
             aht.ASSIGNEE_ = #{userId}
+        <if test="userName != null and userName != ''" >
+            and su.real_name like CONCAT('%', #{userName} ,'%')
+        </if>
         <if test="processInstanceId != null">
             and aht.PROC_INST_ID_ = #{processInstanceId}
         </if>

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

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