|
|
@@ -197,13 +197,14 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
@Override
|
|
|
public Result<Object> submitReview(String id) {
|
|
|
ReimburseApply apply = this.getById(id);
|
|
|
- sendMsg(apply.getLeaderId(), "1", id, null);
|
|
|
+ if (!Check.isNull(apply.getLeaderId())) {
|
|
|
+ sendMsg(apply.getLeaderId(), "1", id, null);
|
|
|
+ }
|
|
|
return Result.ok();
|
|
|
}
|
|
|
|
|
|
// 获取审核人ID
|
|
|
private String getLeader(String userId) {
|
|
|
- String leaderId = "";
|
|
|
JSONObject company = userCompanyService.getCompanyInfoByUserId(userId);
|
|
|
String companyId = company.getString("companyId");
|
|
|
if ("6608ed13c0dd42de93c790dbdf124234".equals(companyId)) {
|
|
|
@@ -212,7 +213,22 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
} else if ("4b10089775c040119e139087517aed88".equals(companyId)) {
|
|
|
//上海汇创思拓数字科技有限公司 直接返回 吴婵
|
|
|
return "183dce577efb49b386369473368cf251";
|
|
|
+ } else if ("4b10089775c040119e139087517aed88".equals(companyId)) {
|
|
|
+ //上海汇创思拓数字科技有限公司 直接返回 吴婵
|
|
|
+ return "183dce577efb49b386369473368cf251";
|
|
|
+ } else if ("d57fecdcf7a94d009736d9c850731582".equals(companyId)) {
|
|
|
+ //北京汇创思拓数字科技有限公司
|
|
|
+ return getCompanyLeader(userId, companyId);
|
|
|
+ } else if ("3f362f527a804e8a9db6552ea12f7574".equals(companyId)) {
|
|
|
+ //石家庄汇创思拓数字科技有限公司
|
|
|
+ return getCompanyLeader(userId, companyId);
|
|
|
}
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 获取公司审核人ID
|
|
|
+ private String getCompanyLeader(String userId, String companyId) {
|
|
|
+ String leaderId = "";
|
|
|
//查询部门
|
|
|
List<SysDepart> departs = sysDepartService.queryUserDeparts(userId);
|
|
|
if (!departs.isEmpty()) {
|
|
|
@@ -221,7 +237,7 @@ public class ReimburseApplyServiceImpl extends ServiceImpl<ReimburseApplyMapper,
|
|
|
JSONObject map = object.getJSONObject(orgCode).getJSONObject("parentMap");
|
|
|
JSONObject leader = null;
|
|
|
//查询审核人员信息
|
|
|
- List<JSONObject> list = baseMapper.selectLeaders();
|
|
|
+ List<JSONObject> list = baseMapper.selectLeaders(companyId);
|
|
|
for (JSONObject obj : list) {
|
|
|
String departName = obj.getString("depart_name");
|
|
|
if (map.toJSONString().contains(departName)) {
|