diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 4fa70f9e..49457da7 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -461,14 +461,6 @@ public class DepositoryRecordController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } map.put("departmenthead", departmentHeadId.toString()); List params = (List) map.get("params"); Integer integer = 0; @@ -998,14 +990,6 @@ public class DepositoryRecordController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } map.put("departmenthead", departmentHeadId.toString()); map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); if (map.containsKey("constructionUnitId")) { @@ -1304,14 +1288,6 @@ public class DepositoryRecordController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } map.put("departmenthead", departmentHeadId.toString()); // 待出库物料id Integer mid = ObjectFormatUtil.toInteger(map.get("iid")); @@ -1452,14 +1428,6 @@ public class DepositoryRecordController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } mainRecord.put("applicantId", userToken.getId()); mainRecord.put("applyRemark", ""); mainRecord.put("quantity", sumQuantity.toString()); diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 60def5a2..532d22bb 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -618,14 +618,6 @@ public class GroupController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 List params = (List) map.get("params"); @@ -793,14 +785,6 @@ public class GroupController { // } departmentHeadId.append("78").append(","); departMentHeadQyWxName.append("PangFuZhen").append(","); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0) { - departmentHeadId = new StringBuilder(userToken.getId().toString()); - String workwechat = userToken.getWorkwechat(); - if(workwechat == null || "".equals(workwechat)){ - workwechat = userToken.getWechat(); - } - departMentHeadQyWxName = new StringBuilder(workwechat); - } map.put("departmenthead", departmentHeadId.toString()); // 获取当前部门所拥有的仓库 diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index 22773e41..d6087088 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1713,7 +1713,7 @@ public class QyWxOperationService { //抄送方式:1-提单时抄送(默认值); 2-单据通过后抄送;3-提单和单据通过后抄送。仅use_template_approver为0时生效。 approvalTemplate.setNotify_type(2); - if (!flag && Integer.compare(userToken.getMaindeparment(), 361) != 0) { + if (!flag) { // 如果有其他仓库且不是仓储中心人 // 获取仓储中心负责人标签的用户userId