From 1d0d25b6f825bae0f8ba9b774b99c8f559ae57ce Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 28 Mar 2024 14:20:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/config/WaterRequestUtil.java | 3 --- .../com/kms/web/controller/system/SysLoginController.java | 7 ++++--- .../java/com/kms/web/controller/tool/TestController.java | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java index 86d7e8e2..3ce5b6ec 100644 --- a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java +++ b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java @@ -284,9 +284,6 @@ public class WaterRequestUtil { - - - private void isSuccess(WaterResult waterResult){ if(waterResult==null){ throw new CustomException("请求异常"); diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index 9851a226..aef02a54 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -282,14 +282,15 @@ public class SysLoginController extends BaseController { List singleMenus = JSONObject.parseArray(result.getData(), SingleMenu.class); List singleAllMenus = new ArrayList<>(); setChildren(singleMenus,singleAllMenus); + String data = waterResult.getData(); + JSONObject datajson = JSONObject.parseObject(data); + List functionPerms = datajson.getJSONArray("functionPerms").toJavaList(String.class); List collect = singleAllMenus.stream().map(singleMenu -> singleMenu.getPermissionCode()).collect(Collectors.toList()); + collect.addAll(functionPerms); QueryWrapper menuQueryWrapper = Wrappers.query(); menuQueryWrapper.in("perms",collect); List menus = sysMenuService.list(menuQueryWrapper); // WaterResult waterResult = waterRequestUtil.authUser(token); - String data = waterResult.getData(); - JSONObject datajson = JSONObject.parseObject(data); -// List functionPerms = datajson.getJSONArray("functionPerms").toJavaList(String.class); List roles = datajson.getJSONArray("roles").toJavaList(String.class); log.info("获取的权限有："+roles); if(CollectionUtil.isNotEmpty(roles)) { diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 8adbbc59..351830e3 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -47,7 +47,7 @@ public class TestController extends BaseController @GetMapping("test") public WaterResult test(){ - WaterResult waterResult = waterRequestUtil.getUserResource("bearer 8dfdea94-4eae-483a-baed-131b2bf8589f"); + WaterResult waterResult = waterRequestUtil.authUser("bearer b6f84142-5a1a-4726-acff-3cc7344bb737"); String data = waterResult.getData(); // String records = JSONObject.parseObject(data).getString("records"); // List singleUserList = JSONObject.parseArray(records, SingleUser.class); From ae655bbe4a288fde8c4d0d37dffff511381c25e9 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 28 Mar 2024 15:17:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/config/WaterRequestUtil.java | 7 +++-- .../controller/system/SysLoginController.java | 27 ++++++++++++++----- .../web/controller/tool/TestController.java | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java index 3ce5b6ec..1cf0d5df 100644 --- a/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java +++ b/jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java @@ -236,11 +236,10 @@ public class WaterRequestUtil { log.info("--------请求获取门户角色信息,请求地址为:"+resourceUrl); HashMap hashMap = new HashMap<>(); hashMap.put("systemCode",systemCode); -// hashMap.put("systemId",systemAppsecret); -// HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret); - HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret); + HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret); +// HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret); get.header("Authorization",authorization); - HttpResponse response = get.body(JSONObject.toJSONString(hashMap)) + HttpResponse response = get .execute(); String body = response.body(); WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class); diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index aef02a54..34e73f75 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -278,6 +278,7 @@ public class SysLoginController extends BaseController { @Transactional public void run() { try { + System.out.println("---------------------------------------------------"); WaterResult result = waterRequestUtil.getUserResource(token); List singleMenus = JSONObject.parseArray(result.getData(), SingleMenu.class); List singleAllMenus = new ArrayList<>(); @@ -290,6 +291,9 @@ public class SysLoginController extends BaseController { QueryWrapper menuQueryWrapper = Wrappers.query(); menuQueryWrapper.in("perms",collect); List menus = sysMenuService.list(menuQueryWrapper); + List menuids = menus.stream().map(menu -> { + return menu.getId(); + }).collect(Collectors.toList()); // WaterResult waterResult = waterRequestUtil.authUser(token); List roles = datajson.getJSONArray("roles").toJavaList(String.class); log.info("获取的权限有："+roles); @@ -298,18 +302,27 @@ public class SysLoginController extends BaseController { sysRoleQueryWrapper.in("role_key", roles); List roleList = sysRoleService.list(sysRoleQueryWrapper); if (CollectionUtil.isNotEmpty(roleList)) { - QueryWrapper sysRoleMenuQueryWrapper = Wrappers.query(); List rids = roleList.stream().map(role -> role.getId()).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(rids)) { - sysRoleMenuQueryWrapper.in("role_id", rids); - sysRoleMenuService.remove(sysRoleMenuQueryWrapper); - } for (SysRole sysRole : roleList) { - for (SysMenu menu : menus) { + QueryWrapper sysRoleMenuQueryWrapper = Wrappers.query(); + if (CollectionUtil.isNotEmpty(rids)) { + sysRoleMenuQueryWrapper.eq("role_id", sysRole.getId()); + List list = sysRoleMenuService.list(sysRoleMenuQueryWrapper); + List menutwoids = list.stream().map(menu -> { + return menu.getMenuId(); + }).collect(Collectors.toList()); + List disjunction = (List) CollectionUtil.disjunction(menuids, menutwoids); + menuids.removeAll(menutwoids); + if(CollectionUtil.isNotEmpty(disjunction)) { //存在不存在的按钮 进行删除 + sysRoleMenuQueryWrapper.in("menu_id", disjunction); + sysRoleMenuService.remove(sysRoleMenuQueryWrapper); + } + } + for (String menu : menuids) { SysRoleMenu sysRoleMenu = new SysRoleMenu(); sysRoleMenu.preInsert(); sysRoleMenu.setRoleId(sysRole.getId()); - sysRoleMenu.setMenuId(menu.getId()); + sysRoleMenu.setMenuId(menu); sysRoleMenuService.save(sysRoleMenu); } } diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java index 351830e3..1b9ad60f 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java @@ -47,7 +47,7 @@ public class TestController extends BaseController @GetMapping("test") public WaterResult test(){ - WaterResult waterResult = waterRequestUtil.authUser("bearer b6f84142-5a1a-4726-acff-3cc7344bb737"); + WaterResult waterResult = waterRequestUtil.getUserResource("bearer b6f84142-5a1a-4726-acff-3cc7344bb737"); String data = waterResult.getData(); // String records = JSONObject.parseObject(data).getString("records"); // List singleUserList = JSONObject.parseArray(records, SingleUser.class); From 58b62e9128703cfbbe099b184ece8ac1302c3542 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 28 Mar 2024 15:20:25 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/web/controller/system/SysLoginController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index 34e73f75..88272394 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -343,7 +343,7 @@ public class SysLoginController extends BaseController { for (SingleMenu singleMenu : singleMenus) { //剔除掉不符合的 if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) { - if (singleMenu.getVisible().equals("1") && singleMenu.getStatus().equals("1")) { + if (singleMenu.getStatus().equals("1")) { singleAllMenus.add(singleMenu); } } @@ -351,7 +351,7 @@ public class SysLoginController extends BaseController { List children = singleMenu.getChildren(); for (SingleMenu child : children) { if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) { - if (singleMenu.getVisible().equals("1") && singleMenu.getStatus().equals("1")) { + if (singleMenu.getStatus().equals("1")) { singleAllMenus.add(child); } } From 0431186a38d478731f6800d2766093e24ce6a597 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 17:28:08 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 3 +- .../mapper/BsSgcjsjdBuiProInfoMapper.java | 46 ++++++++-------- .../service/BsSgcjsjdBuiProInfoService.java | 11 ++-- .../java/com/kms/common/api/CommonApi.java | 19 +++---- .../build/BsSgcjsjdBuiProInfoMapper.xml | 53 ++++++++++++++----- .../BsSgcYxjdEnterpriseInfoMapper.xml | 11 ++-- .../resources/mapper/system/SysDeptMapper.xml | 3 +- 7 files changed, 88 insertions(+), 58 deletions(-) diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java index 88272394..07a02e0c 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java @@ -168,6 +168,7 @@ public class SysLoginController extends BaseController { // 用户信息 SysUser user = UserUtils.getUser(); List menus = menuService.selectMenuTreeByUserId(user.getId()); +// List menus = menuService.selectMenuTreeByUserId("1"); return AjaxResult.success(menuService.buildMenus(menus)); } @@ -241,7 +242,7 @@ public class SysLoginController extends BaseController { /** * 根据用户token获取资源权限 - * @param token + * @param * @return */ // @GetMapping("/getSingleRotes/{token}") diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index f4abad2b..13497f3d 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -44,32 +44,34 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper selectManagePage(@Param("id") String id, - @Param("projectName") String projectName, - @Param("isMajor") String isMajor, - @Param("projectType") String projectType, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - Page page); + IPage selectManagePage(@Param("userId") String userId, + @Param("userType") String userType, + @Param("id") String id, + @Param("projectName") String projectName, + @Param("isMajor") String isMajor, + @Param("projectType") String projectType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); IPage selectPageByCode(@Param("id") String id, - @Param("projectName") String projectName, - @Param("isMajor") String isMajor, - @Param("projectType") String projectType, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - Page page); + @Param("projectName") String projectName, + @Param("isMajor") String isMajor, + @Param("projectType") String projectType, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + Page page); List list(@Param("userId") String uerId, - @Param("userType") String userType, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("proNo") String proNo, - @Param("proCode") String proCode, - @Param("adcd") String adcd, - @Param("orderBy") String orderBy, - @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("userType") String userType, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("proNo") String proNo, + @Param("proCode") String proCode, + @Param("adcd") String adcd, + @Param("orderBy") String orderBy, + @Param("pageNum") int pageNum, + @Param("pageSize") int pageSize); List getHistogram(); diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 42ff5274..02979777 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -178,7 +178,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService list = null; - list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType, + list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); @@ -264,7 +264,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService list = null; - list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType, + list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType, sysXzqhService.getSubString(sp.getData().getAdcd()), "create_time", new Page<>(sp.getPageNum(), sp.getPageSize())); @@ -337,7 +337,12 @@ public class BsSgcjsjdBuiProInfoService extends BaseService 1) { + numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum())); + + }else { + numDto.setNum(Integer.parseInt(dto.get(0).getNum())); + } return numDto; diff --git a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java index d539dac9..7c3e0473 100644 --- a/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java +++ b/jwtech-system/src/main/java/com/kms/common/api/CommonApi.java @@ -175,28 +175,21 @@ public class CommonApi { SysUser user = UserUtils.getUser(); List sysRoles = sysRoleService.getRoleByUserId(user.getId()); List legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList()); - List enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList()); +// List enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList()); - if (CollectionUtil.isEmpty(legalPerson)&&CollectionUtil.isEmpty(enterprise)) { + if (CollectionUtil.isEmpty(legalPerson)) { return AjaxResult.success(true); - } else if (CollectionUtil.isNotEmpty(legalPerson)){ + } else{ LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(SysUserPro.class) .eq(SysUserPro::getUserId, user.getId()); List list = sysUserProService.list(queryWrapper); if (CollectionUtil.isEmpty(list)) { return AjaxResult.success("项目",false); - } else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){ + } /*else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){ return AjaxResult.error("审核未通过,请重新选择", false); - }else { - return AjaxResult.success(true); - } - }else { - List list = sysUserEnterpriseService.list(Wrappers.lambdaQuery(SysUserEnterprise.class) - .eq(SysUserEnterprise::getUserId, user.getId())); - if (CollectionUtil.isEmpty(list)) { - return AjaxResult.success("企业",false); - } else { + }*/ + else { return AjaxResult.success(true); } } diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index 35574415..d54b6ae0 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -165,19 +165,46 @@ diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index d75dff72..dc62d8a9 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -13,7 +13,8 @@ establishment_date, legal_representative, corporate_id_number, - id + id, + unified_social_credit_code from bs_sgc_yxjd_enterprise_info ei @@ -97,14 +98,14 @@ WHERE - id IN ( + unified_social_credit_code IN ( SELECT - enterprise_id + sd.unified_social_credit_code FROM - sys_user_enterprise + sys_user su left join sys_dept sd on su.dept_id=sd.id - AND user_id=#{userId}) + AND su.id=#{userId}) and enterprise_name like concat('%',#{enterpriseName},'%') diff --git a/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml b/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml index 9259b93d..d6c36fa1 100644 --- a/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag, d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background, - d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unifiedSocialCreditCode + d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unified_social_credit_code from sys_dept d @@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ip_end = #{ipEnd}, ip_start = #{ipStart}, xzqh_id = #{xzqhId}, + unified_social_credit_code = #{unifiedSocialCreditCode}, update_time = sysdate() where id = #{id} From cdbda2bc8ee5d3f8ea68b5de9590489e5c3b2d2c Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 18:09:11 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warning/options/warnMsg/index.vue | 3 +- .../mapper/BsSgcjsjdBuiProInfoMapper.java | 4 +- .../service/BsSgcjsjdBuiProInfoService.java | 6 +- .../build/BsSgcjsjdBuiProInfoMapper.xml | 59 +++++++++++++------ 4 files changed, 49 insertions(+), 23 deletions(-) diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue index c5c26b49..2858c8ac 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue @@ -210,7 +210,6 @@ 预警审核 diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index 13497f3d..30ee8cb6 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -74,9 +74,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper getHistogram(); + List getHistogram(@Param("userId")String userId,@Param("userType")String userType); - List getNum(); + List getNum(@Param("userId")String userId,@Param("userType") String userType); FlowDto statistics(@Param("proNo") String proNo, @Param("proCode") String proCode); diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 02979777..5bf3cd33 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -291,7 +291,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService getHistogram() { - List list = bsSgcjsjdBuiProInfoMapper.getHistogram(); + SysUser user = UserUtils.getUser(); + List list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType()); HashMap map = new HashMap<>(); for (int i = 0; i < list.size(); i++) { @@ -327,7 +328,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService dto=bsSgcjsjdBuiProInfoMapper.getNum(); + SysUser user = UserUtils.getUser(); + List dto=bsSgcjsjdBuiProInfoMapper.getNum(user.getId(),user.getUserType()); NumberDto numDto = new NumberDto(); for (Num num : dto) { if (num.getName().equals("ms")) { diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index d54b6ae0..0c2714d6 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -410,24 +410,36 @@ @@ -442,6 +454,19 @@ bs_sgc_jsjd_bui_pro_info pi LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO AND pi.PRO_CODE = pp.PROJECT_CODE + + WHERE + pi.PRO_NO IN ( + SELECT + PRO_NO + FROM + sys_user_pro + + + AND user_id=#{userId}) + + + GROUP BY pi.IS_MAJOR