From 9f71347609dfa13e54f655c96fe6532fdb523196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 7 Sep 2020 23:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/jsh_erp.sql | 2 +-
erp_web/pages/manage/role.html | 1 -
erp_web/pages/manage/rolePushBtn.html | 1 +
.../jsh/erp/constants/BusinessConstants.java | 4 ++
.../service/depotHead/DepotHeadService.java | 45 ++++++++++---------
5 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/docs/jsh_erp.sql b/docs/jsh_erp.sql
index c320699d..39b0ff2e 100644
--- a/docs/jsh_erp.sql
+++ b/docs/jsh_erp.sql
@@ -717,7 +717,7 @@ INSERT INTO `jsh_role` VALUES ('4', '管理员', '全部数据', null, null, nul
INSERT INTO `jsh_role` VALUES ('10', '租户', '全部数据', null, '', null, '0');
INSERT INTO `jsh_role` VALUES ('16', '销售经理', '全部数据', null, 'ddd', '63', '0');
INSERT INTO `jsh_role` VALUES ('17', '销售代表', '个人数据', null, 'rrr', '63', '0');
-INSERT INTO `jsh_role` VALUES ('18', '角色abc', '自定义数据', null, '33333', '63', '0');
+INSERT INTO `jsh_role` VALUES ('18', '角色abc', '本机构数据', null, '33333', '63', '0');
-- ----------------------------
-- Table structure for jsh_sequence
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html
index a4182a7f..197afe99 100644
--- a/erp_web/pages/manage/role.html
+++ b/erp_web/pages/manage/role.html
@@ -58,7 +58,6 @@
-
diff --git a/erp_web/pages/manage/rolePushBtn.html b/erp_web/pages/manage/rolePushBtn.html
index 8dfbe013..c033a9c5 100644
--- a/erp_web/pages/manage/rolePushBtn.html
+++ b/erp_web/pages/manage/rolePushBtn.html
@@ -22,6 +22,7 @@
全选
全取消
保存
+ 只有勾选了编辑按钮，才能进行新增、修改、删除操作
diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
index ef432401..145cc1af 100644
--- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java
+++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java
@@ -165,6 +165,10 @@ public class BusinessConstants {
*/
public static final String DEFAULT_MANAGER = "admin";
+ public static final String ROLE_TYPE_PRIVATE = "个人数据";
+
+ public static final String ROLE_TYPE_THIS_ORG = "本机构数据";
+
diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index 54a9d354..a21371c9 100644
--- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -84,17 +84,7 @@ public class DepotHeadService {
public List select(String type, String subType, String roleType, String number, String beginTime, String endTime,
String materialParam, String depotIds, int offset, int rows)throws Exception {
- String handsPersonIds = "";
- User user = userService.getCurrentUser();
- if("个人数据".equals(roleType)) {
- handsPersonIds = user.getId().toString();
- } else if("本机构数据".equals(roleType)) {
- handsPersonIds = orgaUserRelService.getUserIdListByUserId(user.getId());
- }
- String [] handsPersonIdArray=null;
- if(StringUtil.isNotEmpty(handsPersonIds)){
- handsPersonIdArray = handsPersonIds.split(",");
- }
+ String [] handsPersonIdArray = getHandsPersonIdArray(roleType);
List resList = new ArrayList();
List list=null;
try{
@@ -134,17 +124,7 @@ public class DepotHeadService {
public Long countDepotHead(String type, String subType, String roleType,String number, String beginTime, String endTime,
String materialParam, String depotIds) throws Exception{
- String handsPersonIds = "";
- User user = userService.getCurrentUser();
- if("个人数据".equals(roleType)) {
- handsPersonIds = user.getId().toString();
- } else if("本机构数据".equals(roleType)) {
- handsPersonIds = orgaUserRelService.getUserIdListByUserId(user.getId());
- }
- String [] handsPersonIdArray=null;
- if(StringUtil.isNotEmpty(handsPersonIds)){
- handsPersonIdArray = handsPersonIds.split(",");
- }
+ String [] handsPersonIdArray = getHandsPersonIdArray(roleType);
Long result=null;
try{
result=depotHeadMapperEx.countsByDepotHead(type, subType, handsPersonIdArray, number, beginTime, endTime, materialParam, depotIds);
@@ -154,6 +134,27 @@ public class DepotHeadService {
return result;
}
+ /**
+ * 根据角色类型获取经手人数组
+ * @param roleType
+ * @return
+ * @throws Exception
+ */
+ private String[] getHandsPersonIdArray(String roleType) throws Exception {
+ String handsPersonIds = "";
+ User user = userService.getCurrentUser();
+ if(BusinessConstants.ROLE_TYPE_PRIVATE.equals(roleType)) {
+ handsPersonIds = user.getId().toString();
+ } else if(BusinessConstants.ROLE_TYPE_THIS_ORG.equals(roleType)) {
+ handsPersonIds = orgaUserRelService.getUserIdListByUserId(user.getId());
+ }
+ String [] handsPersonIdArray=null;
+ if(StringUtil.isNotEmpty(handsPersonIds)){
+ handsPersonIdArray = handsPersonIds.split(",");
+ }
+ return handsPersonIdArray;
+ }
+
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int insertDepotHead(String beanJson, HttpServletRequest request)throws Exception {
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);