From 07b3293fd92ee47c1db4d82de36ff3714a1da98e Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 09 Oct 2020 18:33:31 +0800
Subject: [PATCH] 1.修改增加运营平台首页查看数据的角色值 2.修改部分角色的数据范围为空时的报错。
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 14 ++++++--------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html | 22 ++++++++++++++++++++++
3 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 8a1dd0e..c23fe7a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -326,15 +326,13 @@
Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
List<SysUser> list = baseMapper.findList(page, params);
long total = page.getTotal();
- if (total > 0) {
+ if (total > 0&&list.size()>0) {
List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
-
- List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
-
-// Map<String, Object> map = new HashMap<String, Object>();
-// List<SysOrganization> sysOrganizationList=organizationService.fin();
- list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
- .collect(Collectors.toList())));
+ if (userIds.size()>0) {
+ List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);
+ list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
+ .collect(Collectors.toList())));
+ }
}
return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index f64ca97..f565c82 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -6,7 +6,7 @@
<where>
t.is_del=0
<if test="u.id != null and u.id != ''">
- and t.id like concat('%', #{u.id}, '%')
+ and t.id = #{u.id}
</if>
<if test="u.username != null and u.username != ''">
and t.username like concat('%', #{u.username}, '%')
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
index 4dc5240..5c497c5 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
@@ -462,6 +462,7 @@
element.code == "dev_admin" ||
element.code == "pc_admin" ||
element.code == "oprationmanager" ||
+ element.code == "salemanager" ||
element.code == "dev_user" ||
element.code == "shop_admin" ||
element.code == "app_admin") {
@@ -563,6 +564,27 @@
}
}
}
+ else
+ {
+ $("#h_hospital").html(noData);
+ //用户反馈
+ $("#u_feedback").html(noData);
+ //数据需求
+ $("#d_dataneed").html(noData);
+ //H端医生
+ $("#h_doctor").html(noData);
+ //C端医生
+ $("#c_doctor").html(noData);
+ //签约医生
+ $("#u_signing").html(noData);
+ //医答医生
+ $("#d_isanswer").html(noData);
+ //待审核医生
+ $("#ht_doctor").html(noData);
+ $("#u_product").html(noData);
+ $("#t_product").html(noData);
+ layer.closeAll('loading');
+ }
});
</script>
</body>
--
Gitblit v1.8.0