purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加本机构数据权限的逻辑

Browse Source
This commit is contained in:
季圣华
2020-09-07 00:54:54 +08:00
parent 3b4afd98d7
commit dce1a9b18e
9 changed files with 148 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -15,6 +15,7 @@ import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.exception.JshException;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.log.LogService;
import com.jsh.erp.service.orgaUserRel.OrgaUserRelService;
import com.jsh.erp.service.serialNumber.SerialNumberService;
import com.jsh.erp.service.supplier.SupplierService;
import com.jsh.erp.service.user.UserService;
@@ -53,6 +54,8 @@ public class DepotHeadService {
@Resource
private SerialNumberService serialNumberService;
@Resource
private OrgaUserRelService orgaUserRelService;
@Resource
DepotItemMapperEx depotItemMapperEx;
@Resource
private LogService logService;
@@ -81,15 +84,21 @@ public class DepotHeadService {
public List<DepotHeadVo4List> select(String type, String subType, String roleType, String number, String beginTime, String endTime,
String materialParam, String depotIds, int offset, int rows)throws Exception {
Long handsPersonId = null;
String handsPersonIds = "";
User user = userService.getCurrentUser();
if("个人数据".equals(roleType)) {
handsPersonId = user.getId();
handsPersonIds = user.getId().toString();
} else if("本机构数据".equals(roleType)) {
handsPersonIds = orgaUserRelService.getUserIdListByUserId(user.getId());
}
String [] handsPersonIdArray=null;
if(StringUtil.isNotEmpty(handsPersonIds)){
handsPersonIdArray = handsPersonIds.split(",");
}
List<DepotHeadVo4List> resList = new ArrayList<DepotHeadVo4List>();
List<DepotHeadVo4List> list=null;
try{
list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, handsPersonId, number, beginTime, endTime, materialParam, depotIds, offset, rows);
list=depotHeadMapperEx.selectByConditionDepotHead(type, subType, handsPersonIdArray, number, beginTime, endTime, materialParam, depotIds, offset, rows);
}catch(Exception e){
JshException.readFail(logger, e);
}
@@ -125,14 +134,20 @@ public class DepotHeadService {
public Long countDepotHead(String type, String subType, String roleType,String number, String beginTime, String endTime,
String materialParam, String depotIds) throws Exception{
Long handsPersonId = null;
String handsPersonIds = "";
User user = userService.getCurrentUser();
if("个人数据".equals(roleType)) {
handsPersonId = user.getId();
handsPersonIds = user.getId().toString();
} else if("本机构数据".equals(roleType)) {
handsPersonIds = orgaUserRelService.getUserIdListByUserId(user.getId());
}
String [] handsPersonIdArray=null;
if(StringUtil.isNotEmpty(handsPersonIds)){
handsPersonIdArray = handsPersonIds.split(",");
}
Long result=null;
try{
result=depotHeadMapperEx.countsByDepotHead(type, subType, handsPersonId, number, beginTime, endTime, materialParam, depotIds);
result=depotHeadMapperEx.countsByDepotHead(type, subType, handsPersonIdArray, number, beginTime, endTime, materialParam, depotIds);
}catch(Exception e){
JshException.readFail(logger, e);
}