增加根据用户获取全部机构树接口,给零售统计增加机构id参数
This commit is contained in:
@@ -560,6 +560,7 @@ public class DepotItemController {
|
||||
@RequestParam("endTime") String endTime,
|
||||
@RequestParam(value = "organId", required = false) Long organId,
|
||||
@RequestParam(value = "depotId", required = false) Long depotId,
|
||||
@RequestParam(value = "organizationId", required = false) Long organizationId,
|
||||
@RequestParam("materialParam") String materialParam,
|
||||
@RequestParam("mpList") String mpList,
|
||||
HttpServletRequest request)throws Exception {
|
||||
@@ -569,6 +570,9 @@ public class DepotItemController {
|
||||
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
|
||||
try {
|
||||
String [] creatorArray = depotHeadService.getCreatorArray();
|
||||
if(creatorArray == null && organizationId != null) {
|
||||
creatorArray = depotHeadService.getCreatorArrayByOrg(organizationId);
|
||||
}
|
||||
String [] organArray = null;
|
||||
List<Long> depotList = depotService.parseDepotList(depotId);
|
||||
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
|
||||
|
||||
Reference in New Issue
Block a user