diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/test/TestController.java b/src/main/java/com/chinaweal/aiccs/aiccs/test/TestController.java index 9c075b5..ca8f2b0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/test/TestController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/test/TestController.java @@ -2188,7 +2188,7 @@ public class TestController { Set bizSeqSet = tsWritService.lambdaQuery() .select(TSWrit::getBizseq) .in(TSWrit::getWritstype, "55", "56", "57", "58", "59", "60", "62", "63") - .between(TSWrit::getCreatetime, "2026-01-01 00:00:00", "2026-01-08 20:00:00") + .between(TSWrit::getCreatetime, "2026-01-01 00:00:00", "2026-01-07 12:00:00") .list().stream().map(TSWrit::getBizseq).collect(Collectors.toSet()); for (String bizSeq : bizSeqSet) { diff --git a/src/main/java/com/chinaweal/aiccs/org/service/impl/TUsersServiceImpl.java b/src/main/java/com/chinaweal/aiccs/org/service/impl/TUsersServiceImpl.java index 82fd4db..97373cc 100644 --- a/src/main/java/com/chinaweal/aiccs/org/service/impl/TUsersServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/org/service/impl/TUsersServiceImpl.java @@ -136,44 +136,25 @@ public class TUsersServiceImpl extends BaseServiceImpl imp permission = null; //获取当前部门的权限列表人 List currList = aicorgService.getUsersByOrgAndPermission(permission,orgId); - //判断是否需要获取区局权限 - if (isArea!=null && isArea) { - try { - AICOrg parentOrgByPK = aicorgService.toAICOrg(aicorgService.findParentOrgByPK(orgId)); - if (parentOrgByPK != null) { - OrgUnits orgUnits = tUsersMapper.byOrgUnitId(parentOrgByPK.getPrimaryKey()); - if (orgUnits != null && 3 == orgUnits.getOrgLevel()) { - //父级是区局的查询出来 - userList = orgUM.findUsersByOrgAndPermission(parentOrgByPK.getPrimaryKey(), permission); - } - } - }catch (Exception e){ - log.error(e.getMessage()); - } - } +// //判断是否需要获取区局权限 +// if (isArea!=null && isArea) { +// try { +// AICOrg parentOrgByPK = aicorgService.toAICOrg(aicorgService.findParentOrgByPK(orgId)); +// if (parentOrgByPK != null) { +// OrgUnits orgUnits = tUsersMapper.byOrgUnitId(parentOrgByPK.getPrimaryKey()); +// if (orgUnits != null && 3 == orgUnits.getOrgLevel()) { +// //父级是区局的查询出来 +// userList = orgUM.findUsersByOrgAndPermission(parentOrgByPK.getPrimaryKey(), permission); +// } +// } +// }catch (Exception e){ +// log.error(e.getMessage()); +// } +// } if (currList != null) { userList.addAll(currList); userList.forEach(each -> each.setPassword(null)); } - List userListXyc = new ArrayList<>();//信用处审批权限人员 - List userListDjzc = new ArrayList<>();//登记注册二处审批权限人员 - if ("001".equals(loginUser.getOrgID())&& "001-007".equals(loginUser.getUnitID())){ - if ("hearingRegDepLeader".equals(permission) || "hearingRegDepHandle".equals(permission) || "approvalHearing".equals(permission)) { - for (int i = 0; i < userList.size(); i++) {//加法规处的人 - if ("ffe933ae-4a38-458f-a842-be19a5800c5a".equals(userList.get(i).getUnitID())){ - userListXyc.add(userList.get(i)); - } - } - } - for (int i = 0; i < userList.size(); i++) { - if ("001-007".equals(userList.get(i).getUnitID())){ - userListXyc.add(userList.get(i)); - } - } - //返回信用处的审批权限人员 - Collections.reverse(userListXyc); - return userListXyc; - } Collections.reverse(userList); return userList; }