diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml index 963b4ff..2e0cb89 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/mapper/xml/EmployeesOrgMapper.xml @@ -11,7 +11,7 @@ LEFT JOIN sys_depart b ON a.org_code = b.org_code WHERE a.employees_id = #{employeesId} - AND a.iz_freeze = '0' + AND a.iz_freeze = 'N' AND a.iz_history = 'N' AND (a.status = '2' or a.apply_type = '2') diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index b44eeb3..cf070b2 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -147,7 +147,7 @@ public class EmployeesMQListener { public void handleSysuserPwd(SysUserMQDto dto) { UpdateWrapper uw = new UpdateWrapper<>(); uw.eq("employees_id", dto.getEmployeeId()); - uw.eq("iz_freeze", "0");//未冻结 + uw.eq("iz_freeze", "N");//未冻结 uw.eq("iz_history", "N");//非历史 uw.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过 List list = employeesOrgService.list(uw); @@ -202,7 +202,7 @@ public class EmployeesMQListener { } else { UpdateWrapper uwOrg = new UpdateWrapper<>(); uwOrg.eq("employees_id", dto.getEmployeeId()); - uwOrg.eq("iz_freeze", "0");//未冻结 + uwOrg.eq("iz_freeze", "N");//未冻结 uwOrg.eq("iz_history", "N");//非历史 uwOrg.and(c -> c.eq("apply_type", "2").or().eq("status", "2"));//审批通过 uwOrg.eq("org_code", employeesAd.getLastLoginOrg());//机构