From 2399bb695d135f6d766cd5161fb65c6e7ac4f993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?niohe=C2=B7erbao?= Date: Fri, 24 Mar 2023 17:06:24 +0800 Subject: [PATCH 1/4] fix --- .../ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java index 2a3ae49..fb49fdf 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java @@ -38,7 +38,7 @@ public class CompanyFiscalCodeController { } @ApiOperation(value = "获取财政编码-配置", notes = "获取财政编码配置") - @PostMapping("/fiscal-and-seal/get-configure/") + @PostMapping("/fiscal-and-seal/get-configure") public ResCompanyFiscalCodeAndSealSnVO getFiscalAndSealCodeConfigure(@Valid @RequestBody ReqGetCompanyFiscalCodeAndSealSnPO request) { return companyFiscalCodeManage.getFiscalCodeConfigure(request); } From 4292c2c20a22da22e43bfbc981591b9d8daf966a Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 24 Mar 2023 17:48:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90pid=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/common/util/TreeUtil.java | 40 ++-------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/TreeUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/TreeUtil.java index b693c87..64436ad 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/TreeUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/TreeUtil.java @@ -65,6 +65,7 @@ public final class TreeUtil { List allIds = treeList.stream().map(node -> node.getId()).collect(Collectors.toList()); for (E baseNode : treeList) { if (!allIds.contains(baseNode.getPid()) || selfIdEqSelfParent.contains(baseNode.getPid())) { + baseNode.setPid(null); baseNode.setTopMenu(baseNode.getName()); trees.add(baseNode); } @@ -132,9 +133,10 @@ public final class TreeUtil { if (currMenus == null) { return Collections.emptyList(); } - ArrayList menus = new ArrayList<>(currMenus); + List menus = new ArrayList<>(currMenus); for (MenuRoleVO curr : currMenus) { if (curr.getPid().equals(StrPool.DEF_PARENT_ID)) { + curr.setPid(null); curr.setTopMenu(curr.getName()); } else { curr.setTopMenu(menuMap.get(curr.getPid()).getTopMenu()); @@ -153,40 +155,4 @@ public final class TreeUtil { return menus; } - - /** - * 动态判断redirect - * - * @param baseNode - */ - private static void checkRedirect(MenuRoleVO baseNode) { - checkMenuRedirect(baseNode, baseNode.getChildren()); - } - - private static Boolean checkMenuRedirect(MenuRoleVO baseNode, List menus) { - if (baseNode.getSize() > 0) { - for (MenuRoleVO menu : menus) { - if (menu.getPath().endsWith("Datav")) { - baseNode.setRedirect(menu.getComponent()); - return Boolean.TRUE; - } - - if (menu.getSize() == 0 && 0 == menu.getHidden()) { - baseNode.setRedirect(menu.getComponent()); - return Boolean.TRUE; - } - } - - //一轮没有合适的菜单 去三级菜单找 - for (MenuRoleVO menu : menus) { - if (menu.getSize() > 0) { - if (checkMenuRedirect(baseNode, menu.getChildren())) { - return Boolean.TRUE; - } - } - } - } - - return Boolean.FALSE; - } } From aa11ffcdf9bac7f17b3a56b094ee02f9d714d667 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 24 Mar 2023 18:04:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java index e6ba96c..6c88351 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/MenuManage.java @@ -1,14 +1,10 @@ package com.ningdatech.pmapi.sys.manage; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.common.util.TreeUtil; import com.ningdatech.pmapi.sys.model.entity.Menu; -import com.ningdatech.pmapi.sys.model.entity.RoleMenu; import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO; -import com.ningdatech.pmapi.sys.service.IRoleMenuService; -import com.ningdatech.pmapi.user.util.LoginUserUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -26,11 +22,7 @@ import java.util.List; @RequiredArgsConstructor public class MenuManage { - private final IRoleMenuService roleMenuService; - public List buildUserMenu(List list) { - List roleMenus = roleMenuService.list(Wrappers.lambdaQuery(RoleMenu.class) - .in(RoleMenu::getRoleId, LoginUserUtil.getRoleIdList())); List menuRoles = CollUtils.convert(list, w -> BeanUtil.copyProperties(w, MenuRoleVO.class)); return TreeUtil.buildUserTree(menuRoles); } From 379e13fe13572ec73e3943838e0ceb4b144dad5b Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 24 Mar 2023 18:11:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8A=84=E9=80=81=E6=88=91=20=E4=BA=BA?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml index 56e4cdd..e22baae 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/mapper/StatisticsMapper.xml @@ -13,11 +13,13 @@ sum(CASE WHEN ht.assignee_ = #{userId} AND ht.end_time_ is NULL THEN 1 end) todoNum, sum(CASE WHEN ht.assignee_ = #{userId} AND ht.end_time_ IS not NULL THEN 1 end) idoNum, sum(CASE WHEN hp.start_user_id_ = #{userId} THEN 1 end) mysubmitNum, - 0 ccmeNum + sum(CASE WHEN cc.user_id = #{userId} THEN 1 end) ccmeNum FROM act_hi_procinst hp LEFT JOIN act_hi_taskinst ht ON hp.proc_inst_id_ = ht.proc_inst_id_ + LEFT JOIN + wflow_cc_tasks cc ON cc.instance_id = hp.proc_inst_id_ GROUP BY hp.id_ ) tol