From 44dbbc0052c11fa7fdb98d9a685603ab79d34dbe Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Mon, 2 Dec 2024 18:26:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E8=80=83?= =?UTF-8?q?=E5=8B=A4=E8=A7=84=E5=88=99=E4=BF=AE=E6=94=B9=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/system/att/controller/OrgChangeController.java | 1 + .../bonus/system/basic/controller/SysUserController.java | 1 + .../src/main/resources/mapper/att/OrgChangeMapper.xml | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java index 3f7e300..45ca97e 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java @@ -59,6 +59,7 @@ public class OrgChangeController extends BaseController { try{ startPage(); //不查撤回的 + bean.setIsCheck("-1"); return getDataTable(orgChangeService.selectOrgChangeList(bean)); }catch (Exception e){ log.error(e.toString(),e); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java index 5241e6b..ea3c282 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java @@ -188,6 +188,7 @@ public class SysUserController extends BaseController { List orgList = userService.getOrgByUserId(user); user.setOrgList(orgList); // 获取考勤组 + List attGroupList = userService.getAttGroupByUserId(user); if(!attGroupList.isEmpty()){ user.setAttGroupId(attGroupList.get(0).getId()); diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml index 1a10d55..b9a010f 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml @@ -27,7 +27,12 @@ and oc.create_time between #{startTime} and #{endTime} - and oc.is_check = #{isCheck} + + and oc.is_check in (0,1,2) + + + and oc.is_check = #{isCheck} + group by oc.is_check ASC