|
|
|
@ -2488,19 +2488,13 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
Depository depositoryById = depositoryMapper.findDepositoryById(recordP.getDepositoryId()); |
|
|
|
// 获取当前仓库所属的部门
|
|
|
|
String adminorg = depositoryById.getAdminorg(); |
|
|
|
// 获取当前部门id对应的企业微信id
|
|
|
|
JSONObject portByQyWx = PortConfig.getUserPortByQyWx(ObjectFormatUtil.toInteger(adminorg)); |
|
|
|
Integer wechatorganizationid = portByQyWx.getInteger("wechatorganizationid"); |
|
|
|
|
|
|
|
// 获取当前部门信息
|
|
|
|
qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment(userAgent, wechatorganizationid); |
|
|
|
// 获取部门负责人id列表
|
|
|
|
List<String> otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); |
|
|
|
for (String s : otherDepartmentIdList) { |
|
|
|
Map<String, Object> userByQyWxUserId = PortConfig.findUserByQyWxUserId(s); |
|
|
|
UserByPort user = (UserByPort) userByQyWxUserId.get("user"); |
|
|
|
depositoryManager.append(user.getId()).append(","); |
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg),null); |
|
|
|
for (UserByPort departmentHead:departmentHeadByUser |
|
|
|
) { |
|
|
|
depositoryManager.append(departmentHead.getId()).append(","); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
map.put("state", "待仓储中心负责人审核"); |
|
|
|
// 获取仓储中心负责人标签的用户userId
|
|
|
|
@ -2897,29 +2891,23 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
Depository depositoryById = depositoryMapper.findDepositoryById(record.getDepositoryId()); |
|
|
|
// 获取当前仓库所属的部门
|
|
|
|
String adminorg = depositoryById.getAdminorg(); |
|
|
|
// 获取当前部门id对应的企业微信id
|
|
|
|
JSONObject portByQyWx = PortConfig.getUserPortByQyWx(ObjectFormatUtil.toInteger(adminorg)); |
|
|
|
Integer wechatorganizationid = portByQyWx.getInteger("wechatorganizationid"); |
|
|
|
|
|
|
|
// 获取当前部门信息
|
|
|
|
qywxDepartment wxDepartment = QyWxConfig.getQyWxDepartment(userAgent, wechatorganizationid); |
|
|
|
// 获取部门负责人企业微信id列表
|
|
|
|
List<String> otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); |
|
|
|
for (String s:otherDepartmentIdList |
|
|
|
) { |
|
|
|
Map<String, Object> userByQyWxUserId = PortConfig.findUserByQyWxUserId(s); |
|
|
|
UserByPort otherDepartment = (UserByPort) userByQyWxUserId.get("user"); |
|
|
|
QyWxUid.append(s).append(","); |
|
|
|
depositoryManager.append(otherDepartment.getId()).append(","); |
|
|
|
|
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg),null); |
|
|
|
for (UserByPort departmentHead:departmentHeadByUser |
|
|
|
) { |
|
|
|
depositoryManager.append(departmentHead.getId()).append(","); |
|
|
|
String workwechat = departmentHead.getWorkwechat(); |
|
|
|
if(workwechat == null || "".equals(workwechat)){ |
|
|
|
workwechat = departmentHead.getWechat(); |
|
|
|
} |
|
|
|
QyWxUid.append(workwechat).append(","); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
// 如果是正常仓库
|
|
|
|
|
|
|
|
// 获取仓储中心详情
|
|
|
|
Administration company = LinkInterfaceUtil.getCompany(361, userToken); |
|
|
|
|
|
|
|
// 获取仓储中心负责人
|
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, userToken); |
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(361,userToken); |
|
|
|
|
|
|
|
for (UserByPort userByPort : departmentHeadByUser) { |
|
|
|
depositoryManager.append(userByPort.getId()).append(","); |
|
|
|
@ -3395,10 +3383,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { |
|
|
|
// 如果点击的是通过
|
|
|
|
map.put("departmentheadPass", 1); |
|
|
|
map.put("state", "待仓储中心负责人审核"); |
|
|
|
// 获取仓储中心详情
|
|
|
|
Administration company = LinkInterfaceUtil.getCompany(361, null); |
|
|
|
// 获取仓储中心负责人
|
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, null); |
|
|
|
List<UserByPort> departmentHeadByUser = PortConfig.findDepartmentHeadByUser(361,null); |
|
|
|
StringBuilder depositoryManager = new StringBuilder(); |
|
|
|
StringBuilder QyWxUid = new StringBuilder(); |
|
|
|
// for (int i = 0; i < departmentHeadByUser.size(); i++) {
|
|
|
|
|