From 88477b811b33e4f6a976ecd5be03bebd95aa17eb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 16:54:45 +0800
Subject: [PATCH] 添加 产品管理；合同管理；医院管理；医生管理；公司管理； 消费记录 的数据权限
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/RoleOrganizationService.java | 31 +++++
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java | 12 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysRoleOrganizationMapper.xml | 10
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 7
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml | 1
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 1
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java | 3
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml | 2
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 13 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml | 46 +++++++
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java | 13 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml | 1
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java | 3
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java | 43 ------
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 9 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 3
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java | 8 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysHospitalServiceImpl.java | 8 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java | 25 ++++
/dev/null | 33 -----
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java | 10 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 4
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java | 6
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java | 13 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java | 4
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 8 +
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java | 5
32 files changed, 231 insertions(+), 111 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/RoleOrganizationService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/RoleOrganizationService.java
new file mode 100644
index 0000000..cb00255
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/RoleOrganizationService.java
@@ -0,0 +1,31 @@
+package com.kidgrow.oprationcenter.feign;
+
+import com.kidgrow.common.constant.ServiceNameConstants;
+import com.kidgrow.common.model.SysRole;
+import com.kidgrow.oprationcenter.feign.fallback.DiagnosticServiceFallbackFactory;
+import com.kidgrow.ribbon.config.FeignHttpInterceptorConfig;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ * @Description: 孩子的每次诊断数据
+ * @Project: 用户中心
+ * @CreateDate: Created in 2020-04-07 15:26:33 <br>
+ * @Author: <a href="2396341626@kidgrow.com">zhaobingliang</a>
+ * @version: 1.0
+ */
+@FeignClient(value = ServiceNameConstants.USER_SERVICE,configuration= FeignHttpInterceptorConfig.class,
+ fallbackFactory = DiagnosticServiceFallbackFactory.class, decode404 = true)
+public interface RoleOrganizationService {
+ /**
+ * feign rpc访问远程 接口
+ */
+ @PostMapping(value = "/sysroleorganization/getRoleOrg")
+ Map<String, Object> getRoleOrgMap(List<SysRole> list) ;
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
new file mode 100644
index 0000000..86559ec
--- /dev/null
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/RoleOrganizationServiceFallbackFactory.java
@@ -0,0 +1,25 @@
+package com.kidgrow.oprationcenter.feign.fallback;
+
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysRole;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
+import feign.hystrix.FallbackFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class RoleOrganizationServiceFallbackFactory implements FallbackFactory<RoleOrganizationService> {
+ @Override
+ public RoleOrganizationService create(Throwable throwable) {
+ return new RoleOrganizationService() {
+ @Override
+ public Map<String, Object> getRoleOrgMap(List<SysRole> list) {
+ Map<String, Object> map=new HashMap<>();
+ map.put("id",null);
+ return map;
+ }
+ };
+ }
+}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
index 874be8d..7f51947 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
@@ -80,4 +80,8 @@
* 状态，1启用，0停用
*/
private Boolean enabled;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index d13c348..c3ade36 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -82,4 +82,8 @@
* 状态，1启用，0停用
*/
private Boolean enabled;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
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 5a804ce..800b4a7 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
@@ -86,4 +86,8 @@
* 共享，1是，0不
*/
private Boolean isShare;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
index 481f979..b86b43f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -2,6 +2,7 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.vo.GroupProductDetail;
@@ -29,7 +30,7 @@
* @param params
* @return
*/
- PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params);
+ PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser);
/**
* 统计产品使用量列表
* @param params
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
index ce3828f..c021064 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java
@@ -1,6 +1,8 @@
package com.kidgrow.oprationcenter.service;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
@@ -21,7 +23,7 @@
* @param params
* @return
*/
- PageResult<ProductOrder> findList(Map<String, Object> params);
+ PageResult<ProductOrder> findList(Map<String, Object> params,@LoginUser SysUser sysUser);
/**
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/ISysRoleOrganizationService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/ISysRoleOrganizationService.java
deleted file mode 100644
index d8f9b2e..0000000
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/ISysRoleOrganizationService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.kidgrow.oprationcenter.service.feign;
-
-import com.kidgrow.common.constant.ServiceNameConstants;
-import com.kidgrow.common.model.SysRole;
-import com.kidgrow.oprationcenter.service.feign.fallback.ISysRoleOrganizationServiceFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- *
- * @Description: <br>
- * @Project: <br>
- * @CreateDate: Created in 2020/2/22 14:33 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- */
-@FeignClient(name = ServiceNameConstants.OPRATIONCENTER_SERVER, fallbackFactory = ISysRoleOrganizationServiceFallbackFactory.class, decode404 = true)
-public interface ISysRoleOrganizationService {
- /**
- * 根据条件查询
- * @param list
- */
- @GetMapping(value = "/sysroleorganization/getRoleOrg")
- Map<String, Object> getRoleOrgMap(@RequestParam List<SysRole> list);
-}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/fallback/ISysRoleOrganizationServiceFallbackFactory.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/fallback/ISysRoleOrganizationServiceFallbackFactory.java
deleted file mode 100644
index d5f4027..0000000
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/feign/fallback/ISysRoleOrganizationServiceFallbackFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.kidgrow.oprationcenter.service.feign.fallback;
-
-import com.kidgrow.common.model.SysRole;
-import com.kidgrow.oprationcenter.service.feign.ISysRoleOrganizationService;
-import feign.hystrix.FallbackFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
- *
- * @Description: <br>
- * @Project: <br>
- * @CreateDate: Created in 2020/2/22 14:33 <br>
- * @Author: <a href="4345453@kidgrow.com">liuke</a>
- */
-@Slf4j
-@Component
-public class ISysRoleOrganizationServiceFallbackFactory implements FallbackFactory<ISysRoleOrganizationService> {
- @Override
- public ISysRoleOrganizationService create(Throwable throwable) {
- return new ISysRoleOrganizationService() {
- @Override
- public Map<String, Object> getRoleOrgMap(List<SysRole> list) {
- return new HashMap<>();
- }
- };
- }
-}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index 0207031..f04b5c7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
@@ -32,6 +34,8 @@
public class ProductOrderDetailServiceImpl extends SuperServiceImpl<ProductOrderDetailMapper, ProductOrderDetail> implements IProductOrderDetailService {
@Autowired
DiagnosticService diagnosticService;
+ @Autowired
+ private RoleOrganizationService roleOrganizationService;
/**
* 列表
* @param params
@@ -49,8 +53,10 @@
* @return
*/
@Override
- public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params) {
+ public PageResult<ProductOrderJoinDetail> findAllList(Map<String, Object> params, SysUser sysUser) {
Page<ProductOrderJoinDetail> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ params.putAll(roleOrgMap);
List<ProductOrderJoinDetail> list = baseMapper.findAllList(page,params);
return PageResult.<ProductOrderJoinDetail>builder().data(list).code(0).count(page.getTotal()).build();
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
index e0bf1c1..8184556 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java
@@ -1,14 +1,18 @@
package com.kidgrow.oprationcenter.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
import com.kidgrow.oprationcenter.mapper.ProductOrderMapper;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.service.IProductOrderService;
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.Date;
@@ -26,14 +30,18 @@
@Slf4j
@Service
public class ProductOrderServiceImpl extends SuperServiceImpl<ProductOrderMapper, ProductOrder> implements IProductOrderService {
+ @Autowired
+ private RoleOrganizationService roleOrganizationService;
/**
* 列表
* @param params
* @return
*/
@Override
- public PageResult<ProductOrder> findList(Map<String, Object> params){
+ public PageResult<ProductOrder> findList(Map<String, Object> params,@LoginUser SysUser sysUser){
Page<ProductOrder> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ params.putAll(roleOrgMap);
List<ProductOrder> list = baseMapper.findList(page, params);
return PageResult.<ProductOrder>builder().data(list).code(0).count(page.getTotal()).build();
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
index 2945148..460c42b 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
@@ -5,7 +5,7 @@
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
-import com.kidgrow.oprationcenter.service.feign.ISysRoleOrganizationService;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
import com.kidgrow.oprationcenter.mapper.SysProductMapper;
import com.kidgrow.oprationcenter.model.SysProduct;
import com.kidgrow.oprationcenter.service.ISysProductService;
@@ -30,7 +30,8 @@
@Service
public class SysProductServiceImpl extends SuperServiceImpl<SysProductMapper, SysProduct> implements ISysProductService {
@Autowired
- private ISysRoleOrganizationService sysRoleOrganizationService;
+ private RoleOrganizationService roleOrganizationService;
+
/**
* 列表
* @param params
@@ -39,7 +40,7 @@
@Override
public PageResult<SysProduct> findList(Map<String, Object> params, SysUser sysUser){
Page<SysProduct> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
- Map<String, Object> roleOrgMap = sysRoleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
params.putAll(roleOrgMap);
List<SysProduct> list = baseMapper.findList(page, params);
return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build();
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index e24fcd1..384ca6a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -104,6 +104,7 @@
<if test="p.createTime != null and p.createTime !='' and p.updateTime != null and p.updateTime !=''">
and (DE.create_time between #{p.createTime} and #{p.updateTime})
</if>
+ <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
</where>
</sql>
<!--查询产品的消费记录-->
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
index be88fb0..35dabc4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml
@@ -66,6 +66,7 @@
<if test="p.createTime != null and p.createTime !=''">
and create_time = #{p.createTime}
</if>
+ <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
</where>
</sql>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 4a1c70c..3aa7b4f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -6,6 +6,50 @@
<sql id="Column_List">
*
</sql>
+ <!--定义数据权限的查询-->
+ <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 ==2">
+ AND
+ <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+ create_user_org_code like '${itemtoto.orgCode}%'
+ </foreach>
+ </when>
+ <when test="inx == 3">
+ AND
+ <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+ create_user_org_code = #{itemtoto.orgCode}
+ </foreach>
+ </when>
+ <when test="inx == 4">
+ AND
+ <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+ create_user_org_code like '${itemtoto.orgCode}%'
+ </foreach>
+ </when>
+ <when test="inx == 5">
+ AND
+ <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
+ create_user_id = #{itemtoto.orgCode}
+ </foreach>
+ </when>
+ <otherwise>
+ AND id is null
+ </otherwise>
+ </choose>
+
+ </foreach>
+ </foreach>
+ </if>
+ </sql>
<!--sql查询片段-->
<sql id="where">
@@ -57,7 +101,7 @@
<if test="p.updateTime != null and p.updateTime !=''">
and update_time = #{p.updateTime}
</if>
- <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
+ <include refid="Role_Organization"></include>
</where>
</sql>
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
index fe8ae77..1bef92d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java
@@ -1,8 +1,11 @@
package com.kidgrow.oprationcenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrder;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
@@ -51,12 +54,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser sysUser) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderService.findList(params);
+ return productOrderService.findList(params,sysUser);
}
/**
@@ -84,7 +87,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrder productOrder, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -92,6 +95,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrder.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderService.saveOrUpdate(productOrder);
if (v) {
return ResultBody.ok().data(productOrder).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index 81aad5a..4020c8d 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -1,8 +1,11 @@
package com.kidgrow.oprationcenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
@@ -73,12 +76,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping("/all")
- public PageResult findAllList(@RequestParam Map<String, Object> params) {
+ public PageResult findAllList(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return productOrderDetailService.findAllList(params);
+ return productOrderDetailService.findAllList(params,sysUser);
}
/**
@@ -123,7 +126,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody ProductOrderDetail productOrderDetail, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -131,6 +134,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ productOrderDetail.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v = productOrderDetailService.saveOrUpdate(productOrderDetail);
if (v) {
return ResultBody.ok().data(productOrderDetail).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
index c56f27d..7d046b5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/SysProductController.java
@@ -4,6 +4,7 @@
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.SysProduct;
@@ -86,7 +87,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysProduct sysProduct, BindingResult bindingResult,@LoginUser SysUser sysUser) {
List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -94,6 +95,11 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = sysUser.getOrganizations();
+ if(organizations.size()>0){
+ sysProduct.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
+
boolean v= sysProductService.saveOrUpdate(sysProduct);
if(v) {
return ResultBody.ok().data(sysProduct).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
index 3760064..c4be091 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysCompany.java
@@ -77,4 +77,8 @@
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
index a02592f..2ba88a4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysHospital.java
@@ -133,4 +133,8 @@
* 是否删除，1删除，0未删除
*/
private Boolean isDel;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
index f33c695..a6e89b2 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysCompanyService.java
@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysCompany;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.service.ISuperService;
@@ -22,7 +23,7 @@
* @param params
* @return
*/
- PageResult<SysCompanyVo> findList(Map<String, Object> params);
+ PageResult<SysCompanyVo> findList(Map<String, Object> params, SysUser user);
/**
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
index 96e9ae5..6e57d42 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysHospitalService.java
@@ -2,6 +2,7 @@
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.ISuperService;
import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.vo.HospitalListVo;
@@ -28,7 +29,7 @@
* @param params
* @return
*/
- PageResult<HospitalListVo> findHospitalList(Map<String, Object> params);
+ PageResult<HospitalListVo> findHospitalList(Map<String, Object> params, SysUser user);
/**
* 根据SysHospital对象当做查询条件进行查询
* @param sysHospital
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
index fb8302b..68a14e4 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysCompanyServiceImpl.java
@@ -1,6 +1,7 @@
package com.kidgrow.usercenter.service.impl;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysArea;
import com.kidgrow.usercenter.service.ISysAreaService;
import com.kidgrow.usercenter.vo.SysCompanyVo;
@@ -34,6 +35,8 @@
public class SysCompanyServiceImpl extends SuperServiceImpl<SysCompanyMapper, SysCompany> implements ISysCompanyService {
@Autowired
private ISysAreaService sysAreaService;
+ @Autowired
+ private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
private final Integer SHENG=1;
private final Integer SHI=2;
private final Integer XIAN=3;
@@ -43,46 +46,10 @@
* @return
*/
@Override
- public PageResult findList(Map<String, Object> params){
+ public PageResult findList(Map<String, Object> params, SysUser user){
Page<SysCompany> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ SysRoleOrganizationServiceImpl.getRoleOrg(params, user);
List<SysCompany> list = baseMapper.findList(page, params);
-// List<SysCompanyVo> listVo=new ArrayList<>();
-// list.forEach(e -> {
-// SysCompanyVo vo=new SysCompanyVo();
-// BeanCopier beanCopier = BeanCopier.create(SysCompany.class, SysCompanyVo.class, false);
-// beanCopier.copy(e,vo,null);
-// if(vo.getCompanyArea()!=null){
-// SysArea byId = sysAreaService.getById(vo.getCompanyArea());
-// if(byId.getAreaLeveltype()==XIAN){
-// vo.setXianId(byId.getId());
-// vo.setXian(byId.getAreaName());
-// SysArea shi = sysAreaService.getById(byId.getAreaParentId());
-// if(shi!=null){
-// vo.setShi(shi.getAreaName());
-// vo.setShiId(shi.getId());
-// SysArea sheng = sysAreaService.getById(shi.getAreaParentId());
-// if (sheng != null) {
-// vo.setSheng(sheng.getAreaName());
-// vo.setShengId(sheng.getId());
-// }
-// }
-// }
-// if(byId.getAreaLeveltype()==SHI){
-// vo.setShi(byId.getAreaName());
-// vo.setShiId(byId.getId());
-// SysArea sheng = sysAreaService.getById(byId.getAreaParentId());
-// if (sheng != null) {
-// vo.setSheng(sheng.getAreaName());
-// vo.setShengId(sheng.getId());
-// }
-// }
-// if(byId.getAreaLeveltype()==SHENG){
-// vo.setSheng(byId.getAreaName());
-// vo.setShengId(byId.getId());
-// }
-// }
-// listVo.add(vo);
-// });
return PageResult.<SysCompany>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/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index bb8c0e4..ddb172a 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -164,12 +164,19 @@
}
baseMapper.insert(sysDoc);
- //保存将sys_user_org
+ //保存将sys_user_org 保存部门
SysUserOrg sysUserOrg=new SysUserOrg();
sysUserOrg.setUserId(sysUser.getId());
sysUserOrg.setEnabled(false);
sysUserOrg.setOrgId(sysDoctor.getDepartmentId());
sysUserOrg.setCreateTime(new Date());
+ //保存公司
+ sysUserOrgService.saveOrUpdate(sysUserOrg);
+ SysUserOrg sysGongsi=new SysUserOrg();
+ sysGongsi.setUserId(sysUser.getId());
+// sysUser.setEnabled(false);
+ sysGongsi.setOrgId(sysDoctor.getHospitalId());
+// sysUser.setCreateTime(new Date());
sysUserOrgService.saveOrUpdate(sysUserOrg);
//保存到Redis
boolean hset = redisUtils.hset(RedisConstant.USER_ORGANIZATION, sysUserOrg.getUserId().toString(), sysUserOrg);
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 3516eea..9d47ecf 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.usercenter.mapper.SysDepartmentMapper;
import com.kidgrow.usercenter.mapper.SysHospitalMapper;
@@ -12,6 +13,7 @@
import com.kidgrow.usercenter.vo.HospitalListVo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +35,8 @@
public class SysHospitalServiceImpl extends SuperServiceImpl<SysHospitalMapper, SysHospital> implements ISysHospitalService {
@Resource
private SysDepartmentMapper departmentMapper;
+ @Autowired
+ private SysRoleOrganizationServiceImpl SysRoleOrganizationServiceImpl;
/**
* 列表
* @param params
@@ -41,6 +45,7 @@
@Override
public PageResult<SysHospital> findList(Map<String, Object> params){
Page<SysHospital> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+
List<SysHospital> list = baseMapper.findList(page, params);
return PageResult.<SysHospital>builder().data(list).code(0).count(page.getTotal()).build();
}
@@ -50,8 +55,9 @@
* @return
*/
@Override
- public PageResult<HospitalListVo> findHospitalList(Map<String, Object> params) {
+ 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);
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 29d6233..d351487 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
@@ -201,16 +201,16 @@
public void getRoleOrg(Map<String, Object> params, SysUser user){
List<SysRole> roles = user.getRoles();
- List<Map<SysRole,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
+ List<Map<Integer,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
if (!roles.isEmpty()) {
roles.forEach(e->{
- Map<SysRole,List<SysRoleOrganization>> rolemap=new HashMap<>();
+ 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,sysRoleOrganizations);
+ rolemap.put(sysRole.getType(),sysRoleOrganizations);
listroleOrg.add(rolemap);
}
});
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
index 0073909..afd038f 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysCompanyMapper.xml
@@ -63,6 +63,7 @@
<if test="p.updateTime != null and p.updateTime !=''">
and update_time = #{p.updateTime}
</if>
+ <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
</where>
</sql>
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 1c51631..af8c47a 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
@@ -108,6 +108,7 @@
<if test="p.updateTime != null and p.updateTime !=''">
and update_time = #{p.updateTime}
</if>
+
</where>
</sql>
@@ -154,6 +155,7 @@
<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>
</where>
</sql>
<select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo">
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 7ea1aea..bbcdfe1 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
@@ -12,27 +12,27 @@
<choose>
- <when test="inx.type == 1"></when>
+ <when test="inx == 1"></when>
- <when test="inx.type==2">
+ <when test="inx==2">
AND
<foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
create_user_org_code like '${itemtoto.orgCode}%'
</foreach>
</when>
- <when test="inx.type == 3">
+ <when test="inx == 3">
AND
<foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
create_user_org_code = #{itemtoto.orgCode}
</foreach>
</when>
- <when test="inx.type == 4">
+ <when test="inx == 4">
AND
<foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
create_user_org_code like '${itemtoto.orgCode}%'
</foreach>
</when>
- <when test="inx.type == 5">
+ <when test="inx == 5">
AND
<foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
create_user_id = #{itemtoto.orgCode}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
index 8598c56..d468069 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysCompanyController.java
@@ -1,8 +1,11 @@
package com.kidgrow.usercenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysCompany;
import com.kidgrow.usercenter.service.ISysCompanyService;
import io.swagger.annotations.Api;
@@ -46,12 +49,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult list(@RequestParam Map<String, Object> params) {
+ public PageResult list(@RequestParam Map<String, Object> params, @LoginUser SysUser user) {
if(params.size()==0){
params.put("page",1);
params.put("limit",10);
}
- return sysCompanyService.findList(params);
+ return sysCompanyService.findList(params,user);
}
/**
@@ -79,7 +82,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysCompany sysCompany, BindingResult bindingResult, @LoginUser SysUser user) {
List<String> errMsg= new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -87,6 +90,10 @@
}
return ResultBody.failed().msg(errMsg.toString());
} else {
+ List<SysOrganization> organizations = user.getOrganizations();
+ if (organizations.size()>0) {
+ sysCompany.setCreateUserOrgCode(organizations.get(organizations.size()-1).getOrgCode());
+ }
boolean v= sysCompanyService.saveOrUpdate(sysCompany);
if(v) {
return ResultBody.ok().data(sysCompany).msg("保存成功");
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 71bf785..0e8c2bc 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
@@ -1,10 +1,12 @@
package com.kidgrow.usercenter.controller;
+import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.constant.DictionariesConstants;
import com.kidgrow.common.controller.BaseController;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.service.ISysDepartmentService;
import com.kidgrow.usercenter.service.ISysHospitalService;
@@ -73,12 +75,12 @@
@ApiImplicitParam(name = "limit", value = "分页结束位置", required = true, dataType = "Integer")
})
@GetMapping
- public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params) {
+ public PageResult<HospitalListVo> list(@RequestParam Map<String, Object> params, @LoginUser SysUser user) {
if (params.size() == 0) {
params.put("page", 1);
params.put("limit", 10);
}
- return sysHospitalService.findHospitalList(params);
+ return sysHospitalService.findHospitalList(params,user);
}
@PostMapping("findAll")
@@ -133,7 +135,7 @@
*/
@ApiOperation(value = "保存")
@PostMapping
- public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult) {
+ public ResultBody save(@Valid @RequestBody SysHospital sysHospital, BindingResult bindingResult, @LoginUser SysUser sysUser) {
List<String> errMsg = new ArrayList<>();
if (bindingResult.hasErrors()) {
for (ObjectError error : bindingResult.getAllErrors()) {
@@ -165,6 +167,10 @@
}
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());
+ }
boolean v = sysHospitalService.saveOrUpdate(sysHospital);
if (v) {
return ResultBody.ok().data(sysHospital).msg("保存成功");
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java
index 4adaf4d..ed5f2fc 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysRoleOrganizationController.java
@@ -113,8 +113,8 @@
return sysRoleOrganizationService.getTree(params,user);
}
@ApiOperation(value = "获取数据权限的map")
- @GetMapping("getRoleOrg")
- public Map<String, Object> getRoleOrgMap(@RequestParam List<SysRole> list) {
+ @PostMapping("getRoleOrg")
+ public Map<String, Object> getRoleOrgMap(@RequestBody List<SysRole> list) {
SysUser user=new SysUser();
user.setRoles(list);
return sysRoleOrganizationService.getRoleOrgMap(user);
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
index 052a9c6..a7b483a 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
@@ -30,11 +30,6 @@
*/
String DEMO_ORDER_SERVICE="demo-order-server";
/**
- * oprationcenter-server服务
- */
- String OPRATIONCENTER_SERVER = "oprationcenter-server";
-
- /**
* 诊断数据服务
*/
String RECORD_CENTER_SERVICE="recordcenter-server";
--
Gitblit v1.8.0