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