From 3c470b15b952b86c1e38cb9634190a12ccf3d38d Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Wed, 22 Jul 2020 15:32:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 36 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 5
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 30 ++--
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml | 71 ++++++---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserOrgService.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java | 29 ++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/dto/SysRoleOrganizationMybatisDto.java | 9 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java | 2
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 3
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 74 ++++++++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java | 126 ++++++++---------
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 6
14 files changed, 263 insertions(+), 138 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
index 6da3010..aa7327d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -75,20 +76,21 @@
* 状态，1启用，0停用
*/
private Boolean enabled;
- /**
- * 产品结束时间-供前端使用
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date endTime;
- /**
- * 产品结束时间-供前端使用
- */
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- private Date beginTime;
- /**
- * 共享，1是，0不
- */
- private Boolean isShare;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// private Date endTime;
+// /**
+// * 产品结束时间-供前端使用
+// */
+// @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+// @TableField(exist = false)
+// private Date beginTime;
+// /**
+// * 共享，1是，0不
+// */
+// private Boolean isShare;
/**
* 创建者的部门
*/
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/dto/SysRoleOrganizationMybatisDto.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/dto/SysRoleOrganizationMybatisDto.java
new file mode 100644
index 0000000..24661fc
--- /dev/null
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/dto/SysRoleOrganizationMybatisDto.java
@@ -0,0 +1,9 @@
+package com.kidgrow.usercenter.dto;
+
+import lombok.Data;
+
+@Data
+public class SysRoleOrganizationMybatisDto {
+ private boolean flag;
+ private Object object;
+}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserOrgService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserOrgService.java
index 533b70e..a23b078 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserOrgService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserOrgService.java
@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service;
import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUserOrg;
import com.kidgrow.common.service.ISuperService;
@@ -30,6 +31,9 @@
* @return SysUserOrg对象
*/
SysUserOrg findByObject(SysUserOrg sysUserOrg);
+
List<SysUserOrg> getListByMap(Map<String, Object> params);
+
+ List<SysOrganization> getListUser(Long userId);
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
index e5f1a18..e9b5abd 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java
@@ -59,6 +59,9 @@
public PageResult<HospitalListVo> findHospitalList(Map<String, Object> params, SysUser user) {
Page<HospitalListVo> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
+ if(params.get("roleOrg")==null){
+ return PageResult.<HospitalListVo>builder().data(null).code(0).count(page.getTotal()).build();
+ }
List<HospitalListVo> list = baseMapper.findHospitalList(page, params);
return PageResult.<HospitalListVo>builder().data(list).code(0).count(page.getTotal()).build();
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
index d351487..366cea6 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
@@ -4,9 +4,9 @@
import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.*;
import com.kidgrow.usercenter.dto.SysRoleOrganizationDto;
+import com.kidgrow.usercenter.dto.SysRoleOrganizationMybatisDto;
import com.kidgrow.usercenter.mapper.SysRoleMapper;
-import com.kidgrow.usercenter.service.ISysOrganizationService;
-import com.kidgrow.usercenter.service.ISysRoleService;
+import com.kidgrow.usercenter.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,7 +23,7 @@
import com.kidgrow.usercenter.model.SysRoleOrganization;
import com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper;
-import com.kidgrow.usercenter.service.ISysRoleOrganizationService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -39,15 +39,15 @@
public class SysRoleOrganizationServiceImpl extends SuperServiceImpl<SysRoleOrganizationMapper, SysRoleOrganization> implements ISysRoleOrganizationService {
- private final Integer TYPE_QUAN_BU = 1;//全部数据权限
private final Integer TYPE_ZI_DING_YI = 2;//自定义数据权限
- private final Integer TYPE_BEN_BU_MEN = 3;//本部门数据权限
- private final Integer TYPE_BEN_BU_MEN_YI_XIA = 4;//本部门及以下数据权限
- private final Integer TYPE_BEN_REN = 5;//仅本人数据权限不能为空
@Autowired
private ISysOrganizationService iSysOrganizationService;
@Autowired
private ISysRoleService iSysRoleService;
+ @Autowired
+ private ISysRoleUserService iSysRoleUserService;
+ @Autowired
+ private ISysUserOrgService iSysUserOrgService;
@Autowired
private SysOrganizationServiceImpl sysOrganizationService;
@Autowired
@@ -78,6 +78,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateSer(SysRoleOrganizationDto sysRoleOrganizationDto, SysUser user) {
if (sysRoleOrganizationDto.getRoleId() != null) {
SysRole sysRole = iSysRoleService.getById(sysRoleOrganizationDto.getRoleId());
@@ -86,31 +87,19 @@
}
SysRoleOrganization sysRoleOrganization = new SysRoleOrganization();
sysRoleOrganization.setRoleId(sysRoleOrganizationDto.getRoleId());
- List<SysOrganization> organizations = user.getOrganizations();
- // 1代表全部数据权限，2自定义数据权限，3本部门数据权限，4本部门及以下数据权限，5仅本人数据权限不能为空")
//先清除数据
- if(sysRoleOrganizationDto.getRoleId()!=null){
- Map<String,Object> map=new HashMap<>();
- map.put("role_id",sysRoleOrganizationDto.getRoleId());
- map.put("is_del",0);
+ if (sysRoleOrganizationDto.getRoleId() != null) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("role_id", sysRoleOrganizationDto.getRoleId());
+ map.put("is_del", 0);
List<SysRoleOrganization> sysRoleOrganizations = baseMapper.selectByMap(map);
List<Long> collect = sysRoleOrganizations.stream().map(e -> e.getId()).collect(Collectors.toList());
- if(collect.size()>0){
+ if (collect.size() > 0) {
int i = baseMapper.deleteBatchIds(collect);
}
}
-
- //全部数据
- if (sysRoleOrganizationDto.getType() == TYPE_QUAN_BU) {
-// sysRoleOrganization.setOrgCode("10");
-// if (organizations != null && organizations.size() > 0) {
-// sysRoleOrganization.setOrgId(organizations.get(organizations.size()-1).getId());
-// }
-// baseMapper.insert(sysRoleOrganization);
- }
//2自定义数据权限
if (sysRoleOrganizationDto.getType() == TYPE_ZI_DING_YI) {
-
List<Long> orgIds = sysRoleOrganizationDto.getOrgIds();
orgIds.forEach(e -> {
sysRoleOrganization.setId(null);
@@ -121,34 +110,6 @@
}
baseMapper.insert(sysRoleOrganization);
});
- }else {
-
- }
- //3本部门数据权限
- if (sysRoleOrganizationDto.getType() == TYPE_BEN_BU_MEN) {
- if (organizations != null && organizations.size() > 0) {
- sysRoleOrganization.setOrgCode(organizations.get(organizations.size()-1).getOrgCode());
- sysRoleOrganization.setOrgId(organizations.get(organizations.size()-1).getId());
- baseMapper.insert(sysRoleOrganization);
- } else {
- return false;
- }
- }
- //4本部门及以下数据权限
- if (sysRoleOrganizationDto.getType() == TYPE_BEN_BU_MEN_YI_XIA) {
- if (organizations != null && organizations.size() > 0) {
- sysRoleOrganization.setOrgCode(organizations.get(organizations.size()-1).getOrgCode());
- sysRoleOrganization.setOrgId(organizations.get(organizations.size()-1).getId());
- baseMapper.insert(sysRoleOrganization);
- } else {
- return false;
- }
- }
- //5仅本人数据权限不能为空
- if (sysRoleOrganizationDto.getType() == TYPE_BEN_REN) {
- sysRoleOrganization.setOrgCode(organizations.get(organizations.size()-1).getOrgCode());
- sysRoleOrganization.setOrgId(organizations.get(organizations.size()-1).getId());
- baseMapper.insert(sysRoleOrganization);
}
return true;
}
@@ -195,34 +156,61 @@
/**
* 将权限 分装到map对像
+ *
* @param params
* @param user
*/
- public void getRoleOrg(Map<String, Object> params, SysUser user){
- List<SysRole> roles = user.getRoles();
- List<Map<Integer,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
- if (!roles.isEmpty()) {
- roles.forEach(e->{
- Map<Integer,List<SysRoleOrganization>> rolemap=new HashMap<>();
- Map<String,Object> map=new HashMap<>();
- map.put("role_id",e.getId());
- List<SysRoleOrganization> sysRoleOrganizations = baseMapper.selectByMap(map);
- if(sysRoleOrganizations.size()>0){
- SysRole sysRole = sysRoleMapper.selectById(e.getId());
- rolemap.put(sysRole.getType(),sysRoleOrganizations);
+ public void getRoleOrg(Map<String, Object> params, SysUser user) {
+ //获取角色接口
+ List<SysRole> roles = iSysRoleUserService.findRolesByUserId(user.getId());
+ List<SysOrganization> listUser = iSysUserOrgService.getListUser(user.getId());
+ List<Map<Integer, Object>> listroleOrg = new ArrayList<>();
+ if(listUser!=null){
+ if (!roles.isEmpty()) {
+ int index=0;
+ for (SysRole e : roles) {
+ Map<Integer, Object> rolemap = new HashMap<>();
+ SysRoleOrganizationMybatisDto dto=new SysRoleOrganizationMybatisDto();
+ if(e.getType() == 1){
+ dto.setFlag(index==0);
+ dto.setObject(user.getId());
+ rolemap.put(e.getType(), dto);
+ }else if (e.getType() == 2) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("role_id", e.getId());
+ List<SysRoleOrganization> sysRoleOrganizations = baseMapper.selectByMap(map);
+ if (sysRoleOrganizations.size() > 0) {
+ dto.setFlag(index==0);
+ dto.setObject(sysRoleOrganizations);
+ rolemap.put(e.getType(), dto);
+ }
+ } else if (e.getType() == 3) {
+ dto.setFlag(index==0);
+ dto.setObject(user.getOrganizations().get(user.getOrganizations().size() - 1).getOrgCode());
+ rolemap.put(e.getType(), dto);
+ } else if (e.getType() == 4) {
+ dto.setFlag(index==0);
+ dto.setObject(user.getOrganizations().get(user.getOrganizations().size() - 1).getOrgCode());
+ rolemap.put(e.getType(), dto);
+ } else if (e.getType() == 5) {
+ dto.setFlag(index==0);
+ dto.setObject(user.getId());
+ rolemap.put(e.getType(), dto);
+ }
+ index+=1;
listroleOrg.add(rolemap);
- }
- });
+ };
+ }
}
//添加权限控制
- params.put("roleOrg",listroleOrg);
+ params.put("roleOrg", listroleOrg);
}
@Override
public Map<String, Object> getRoleOrgMap(SysUser user) {
- Map<String, Object> map=new HashMap<>();
- getRoleOrg(map,user);
+ Map<String, Object> map = new HashMap<>();
+ getRoleOrg(map, user);
return map;
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
index 1292cd5..291870e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserOrgServiceImpl.java
@@ -2,14 +2,19 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUserOrg;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.usercenter.mapper.SysUserOrgMapper;
+import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,6 +29,8 @@
@Slf4j
@Service
public class SysUserOrgServiceImpl extends SuperServiceImpl<SysUserOrgMapper, SysUserOrg> implements ISysUserOrgService {
+ @Autowired
+ private ISysOrganizationService iSysOrganizationService;
/**
* 列表
* @param params
@@ -56,4 +63,26 @@
List<SysUserOrg> sysUserOrg = baseMapper.selectByMap(params);
return sysUserOrg;
}
+ /**
+ 根据用户id ，查询组织
+ */
+ @Override
+ public List<SysOrganization> getListUser(Long userId) {
+ List<SysOrganization> list=new ArrayList<>();
+ Map<String,Object> map=new HashMap<>();
+ map.put("user_id",userId);
+ map.put("is_del",0);
+ map.put("enabled",1);
+ List<SysUserOrg> sysUserOrgs = baseMapper.selectByMap(map);
+ if (!sysUserOrgs.isEmpty()) {
+ //查询组织
+ sysUserOrgs.forEach(e ->{
+ SysOrganization byId = iSysOrganizationService.getById(e.getOrgId());
+ if (byId!=null) {
+ list.add(byId);
+ }
+ });
+ }
+ return list;
+ }
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
index af8c47a..dcc8a51 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml
@@ -155,7 +155,73 @@
<if test="p.hospitalName != null and p.hospitalName !=''">
and hospital_name LIKE concat('%',#{p.hospitalName},'%')
</if>
- <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
+ <if test="p.roleOrg != null and p.roleOrg.size>0">
+
+ <foreach item="item" collection="p.roleOrg" index="">
+ <foreach item="itemto" collection="item" index="inx">
+
+ <choose>
+ <when test="inx == 1">
+ <if test="itemto.flag">
+ and 1=1
+ </if>
+ <if test="!itemto.flag">
+ or (1=1 and HOS.is_del = 0 and HOS.enabled=1)
+ </if>
+ </when>
+ <when test="inx==2">
+ <if test="itemto.flag">
+ AND
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ </if>
+ <if test="!itemto.flag">
+ or (
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach> and HOS.is_del = 0 and HOS.enabled=1
+ )
+ </if>
+ </when>
+ <when test="inx == 3">
+ <if test="itemto.flag">
+ AND
+ create_user_org_code = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1)
+ </if>
+ </when>
+ <when test="inx == 4">
+ <if test="itemto.flag">
+ AND
+ create_user_org_code like '${itemto.object}%'
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code like '${itemto.object}%' and HOS.is_del = 0 and HOS.enabled=1)
+ </if>
+ </when>
+ <when test="inx == 5">
+ <if test="itemto.flag">
+ AND
+ HOS.create_user_id = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (HOS.create_user_id = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1)
+ </if>
+ </when>
+ <otherwise>
+ AND id is null
+ </otherwise>
+ </choose>
+
+ </foreach>
+ </foreach>
+ </if>
+<!-- <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>-->
</where>
</sql>
<select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo">
@@ -183,10 +249,10 @@
HOS.area_code,
HOS.create_time
FROM
- sys_department DEP
- LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id
+ sys_department DEP
+ LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id
<include refid="whereList"/>
- order by create_time desc
+ order by create_time desc
</select>
<select id="findByName" resultType="com.kidgrow.usercenter.model.SysHospital">
select id,
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
index bbcdfe1..6a5f123 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml
@@ -6,48 +6,71 @@
<!--定义数据权限的查询-->
<sql id="Role_Organization">
<if test="p.roleOrg != null and p.roleOrg.size>0">
-
<foreach item="item" collection="p.roleOrg" index="">
<foreach item="itemto" collection="item" index="inx">
-
-
<choose>
- <when test="inx == 1"></when>
-
+ <when test="inx == 1">
+ <if test="itemto.flag">
+ and 1=1
+ </if>
+ <if test="!itemto.flag">
+ or (1=1 and is_del = 0 and enabled=1)
+ </if>
+ </when>
<when test="inx==2">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
+ <if test="itemto.flag">
+ AND
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ </if>
+ <if test="!itemto.flag">
+ or (
+ <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
+ index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ and is_del = 0 and enabled=1
+ )
+ </if>
</when>
<when test="inx == 3">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code = #{itemtoto.orgCode}
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_org_code = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code = #{itemto.object} and is_del = 0 and enabled=1)
+ </if>
</when>
<when test="inx == 4">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_org_code like '${itemto.object}%'
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_org_code like '${itemto.object}%' and is_del = 0 and enabled=1)
+ </if>
</when>
<when test="inx == 5">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_id = #{itemtoto.orgCode}
- </foreach>
+ <if test="itemto.flag">
+ AND
+ create_user_id = #{itemto.object}
+ </if>
+ <if test="!itemto.flag">
+ or (create_user_id = #{itemto.object} and is_del = 0 and enabled=1)
+ </if>
</when>
<otherwise>
AND id is null
</otherwise>
</choose>
-
</foreach>
</foreach>
</if>
- </sql>
-
+ </sql>
+
<!--定义查询列-->
<sql id="Column_List">
*
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
index b8e9934..2ee5b2d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java
@@ -80,7 +80,7 @@
params.put("page", 1);
params.put("limit", 10);
}
- return sysHospitalService.findHospitalList(params,user);
+ return sysHospitalService.findHospitalList(params, user);
}
@PostMapping("findAll")
@@ -96,7 +96,7 @@
@PostMapping("findAllByMap")
@ApiOperation(value = "查询所有列表")
public ResultBody<SysHospital> findAllByMap(@RequestBody Map<String, Object> params) {
- return sysHospitalService.findAll(params);
+ return sysHospitalService.findAll(params);
}
/**
@@ -108,6 +108,7 @@
SysHospital model = sysHospitalService.getById(id);
return ResultBody.ok().data(model).msg("查询成功");
}
+
/**
* 查询
*/
@@ -120,6 +121,7 @@
return ResultBody.ok().data(null).msg("");
}
}
+
/**
* 根据SysHospital当做查询条件进行查询
*/
@@ -129,15 +131,16 @@
SysHospital model = sysHospitalService.findByObject(sysHospital);
return ResultBody.ok().data(model).msg("查询成功");
}
+
/**
* 修改医院logo
*/
@ApiOperation(value = "保存")
@PostMapping("/updateLogo")
- public ResultBody updateLogo(@RequestBody Map<String, Object> params)
- {
+ public ResultBody updateLogo(@RequestBody Map<String, Object> params) {
return sysHospitalService.updateLogo(params);
}
+
/**
* 新增or更新
*/
@@ -152,32 +155,29 @@
return ResultBody.failed().msg(errMsg.toString());
} else {
//先检查该医院是否存在组织信息
- SysOrganization sysOrganization=new SysOrganization();
- if(sysHospital.getOrgId()!=null){
- sysOrganization.setId(sysHospital.getOrgId());}
- else{
+ SysOrganization sysOrganization = new SysOrganization();
+ if (sysHospital.getOrgId() != null) {
+ sysOrganization.setId(sysHospital.getOrgId());
+ } else {
sysOrganization.setOrgName(sysHospital.getHospitalName());
sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
}
- sysOrganization=organizationService.findByObject(sysOrganization);
- if(sysOrganization==null)
- {
+ sysOrganization = organizationService.findByObject(sysOrganization);
+ if (sysOrganization == null) {
//创建一个组织
- sysOrganization=new SysOrganization();
+ sysOrganization = new SysOrganization();
sysOrganization.setOrgName(sysHospital.getHospitalName());
sysOrganization.setOrgAttr(1);
sysOrganization.setOrgLevel(1);
sysOrganization.setOrgParentId(DictionariesConstants.ORG_PARENT_ID);
- }
- else
- {
+ } else {
sysOrganization.setOrgName(sysHospital.getHospitalName());
}
- boolean org=organizationService.saveOrUpdate(sysOrganization);
+ boolean org = organizationService.saveOrUpdate(sysOrganization);
sysHospital.setOrgId(sysOrganization.getId());
List<SysOrganization> organizations = sysUser.getOrganizations();
- if (organizations.size()>0) {
- sysHospital.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ if (organizations.size() > 0) {
+ sysHospital.setCreateUserOrgCode(organizations.get(organizations.size() - 1).getOrgCode());
}
boolean v = sysHospitalService.saveOrUpdate(sysHospital);
if (v) {
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
index 0bffee9..d28083a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysOrganizationController.java
@@ -127,7 +127,7 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
- boolean v = sysOrganizationService.saveOrUpdate(sysOrganization);
+ boolean v = sysOrganizationService.saveOrUpdateSer(sysOrganization);
if (v) {
return ResultBody.ok().data(sysOrganization).msg("保存成功");
} else {
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index 54f7602..99ce6fd 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,6 +1,6 @@
// var my_api_server_url = 'http://zuul.kidgrow.com/';
-// var my_api_server_url = 'http://192.168.2.240:8888/';
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+// var my_api_server_url = 'http://192.168.2.240:8888/';
+var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://uat-zuul.kidgrow.cloud/';
-var my_api_server_url = 'http://123.57.164.62:8888/';
+//var my_api_server_url = 'http://123.57.164.62:8888/';
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index a1ba4e5..71cf9ca 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -9,8 +9,8 @@
<div class="layui-card-body">
<div class="layui-form toolbar">
<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
- <input type="text" class="layui-input search-input" id="test1"> 至 <input type="text"
- class="layui-input search-input" id="test2">  
+ <input type="text" class="layui-input search-input" id="test1" placeholder="请输入开始时间" > 至 <input type="text"
+ class="layui-input search-input" id="test2" placeholder="请输入结束时间" >  
<button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get"><i class="layui-icon"></i>搜索</button>
<!-- <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon"></i>添加</button> -->
<button id="app-btn-export" class="layui-btn icon-btn permissions" permissions="dataneed-export"><i class="layui-icon"></i>导出</button>
@@ -245,6 +245,7 @@
}
// 导出
$('#app-btn-export').click(function () {
+ //获取
var url = config.base_server + 'api-opration/dataneed/export';
var xhr = new XMLHttpRequest();
xhr.open('POST', url, true);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
index a4f180f..14462d0 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
@@ -9,10 +9,10 @@
<div class="layui-card-body">
<div class="layui-form toolbar"> 
<input id="user-search-value" class="layui-input search-input" type="text" placeholder="输入医生姓名" /> 
- <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+ <input type="text" name="date" id="datebegin" lay-verify="date" placeholder="请输入开始时间" autocomplete="off"
class="layui-input search-input">
至
- <input type="text" name="date" id="dateend" lay-verify="date" placeholder="yyyy-MM-dd" autocomplete="off"
+ <input type="text" name="date" id="dateend" lay-verify="date" placeholder="请输入结束时间" autocomplete="off"
class="layui-input search-input">  
<button id="user-btn-search" class="layui-btn icon-btn permissioins" permissioins="feedback-list"><i class="layui-icon"></i>搜索</button>
</div>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
index 90bec11..1501a0b 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html
@@ -54,7 +54,7 @@
// 获取所有角色
layer.load(2);
- admin.req('api-user/allRoles', {}, function (data) {
+ admin.req('api-user/findByMap', {}, function (data) {
layer.closeAll('loading');
if (0 == data.code) {
// 渲染多选下拉框
--
Gitblit v1.8.0