From 4f3b11f5f2d54424bb795ad2b4c90eba3fbb6a74 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Tue, 27 Dec 2022 09:55:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E6=9F=A5=E8=AF=A2=E6=9C=AA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=AE=A1=E6=A0=B8=E4=BA=BA=E9=83=A8=E9=97=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF=202.=E6=88=91?= =?UTF-8?q?=E7=9A=84=E5=B7=B2=E5=8A=9E=EF=BC=8C=E4=B8=8A=E6=9E=B6=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=203.=E8=B5=84=E9=87=91=E5=A4=A7=E5=B1=8F=E6=80=BB=E8=8A=82?= =?UTF-8?q?=E7=BA=A6=E8=B5=84=E9=87=91=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../renren/modules/sys/service/impl/SysUserServiceImpl.java | 4 ++-- .../src/main/resources/mapper/activiti/ProcessActivityDao.xml | 4 ++++ .../resources/mapper/processForm/TAbilityApplicationDao.xml | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java index ef93af9a..4ca731ec 100644 --- a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java @@ -540,8 +540,8 @@ public class SysUserServiceImpl extends BaseServiceImpl resultList = new ArrayList<>(); - resultList.addAll(sysUserDao.getApproverUnconfiguredDepartment(pageNum, pageSize)); + pageNum = (pageNum - 1) * pageSize; + ArrayList resultList = new ArrayList<>(sysUserDao.getApproverUnconfiguredDepartment(pageNum, pageSize)); Map resultMap = new HashMap<>(); resultMap.put("total", sysUserDao.getApproverUnconfiguredDepartmentCount()); diff --git a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml b/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml index 2995f245..aeb193e1 100644 --- a/renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml +++ b/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} + + and su.real_name like CONCAT('%', #{userName} ,'%') + and aht.PROC_INST_ID_ = #{processInstanceId} diff --git a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml b/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml index 3b6bc1ff..9b78d09d 100644 --- a/renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml +++ b/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" From 4ac7e57d337dbce17a2954a091c23fa234941abf Mon Sep 17 00:00:00 2001 From: wangliwen Date: Tue, 27 Dec 2022 09:58:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/resource/service/impl/ResourceServiceImpl.java | 1 + renren-admin/src/main/resources/logback-spring.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java index a8cce03a..2ece01c4 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java @@ -2984,6 +2984,7 @@ public class ResourceServiceImpl extends CrudServiceImpl { + logger.info("云资源使用信息信息：" + JSON.toJSONString(index)); switch (index.get("type").toString()) { // 根据类型填充其审核状态 case "云主机": case "云数据库": diff --git a/renren-admin/src/main/resources/logback-spring.xml b/renren-admin/src/main/resources/logback-spring.xml index 90ec8960..3abc2e6f 100644 --- a/renren-admin/src/main/resources/logback-spring.xml +++ b/renren-admin/src/main/resources/logback-spring.xml @@ -73,7 +73,7 @@ - +