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 4cea647d..5b07cf63 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -578,17 +578,10 @@ public class DepositoryRecordController { // 获取当前部门负责人 List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (UserByPort departmentHeadByUser : departmentHeadByUsers) { // departmentHeadId.append(departmentHeadByUser.getId()).append(","); -// String workwechat = departmentHeadByUser.getWorkwechat(); -// if (workwechat == null || "".equals(workwechat)) { -// workwechat = departmentHeadByUser.getWechat(); -// } -// departMentHeadQyWxName.append(workwechat + ","); // } departmentHeadId = new StringBuilder("78").append(","); - departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); List params = (List) map.get("params"); Integer integer = 0; @@ -1266,19 +1259,11 @@ public class DepositoryRecordController { UserByPort userToken = AuthenticationTokenPool.getUserToken(usertoken); List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (UserByPort departmentHeadByUser : departmentHeadByUsers) { // departmentHeadId.append(departmentHeadByUser.getId()).append(","); -// String workwechat = departmentHeadByUser.getWorkwechat(); -// if (workwechat == null || "".equals(workwechat)) { -// workwechat = departmentHeadByUser.getWechat(); -// } -// departMentHeadQyWxName.append(workwechat + ","); // } departmentHeadId.append("78").append(","); - departMentHeadQyWxName.append("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); - map.put("departMentHeadQyWxName", departMentHeadQyWxName.toString()); if (map.containsKey("constructionUnitId")) { String constructionUnitId = map.get("constructionUnitId").toString(); if ("".equals(constructionUnitId)) { @@ -1707,17 +1692,10 @@ public class DepositoryRecordController { // 获取部门负责人 List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (UserByPort departmentHeadByUser : departmentHeadByUsers) { // departmentHeadId.append(departmentHeadByUser.getId()).append(","); -// String workwechat = departmentHeadByUser.getWorkwechat(); -// if(workwechat == null || "".equals(workwechat)){ -// workwechat = departmentHeadByUser.getWechat(); -// } -// departMentHeadQyWxName.append(workwechat).append(","); // } departmentHeadId = new StringBuilder("78").append(","); - departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); map.put("adminorgId", userToken.getMaindeparment()); map.put("createUid", userToken.getId()); @@ -1997,17 +1975,10 @@ public class DepositoryRecordController { // 获取部门负责人 List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey, usertoken); StringBuilder departmentHeadId = new StringBuilder(); - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (UserByPort departmentHeadByUser : departmentHeadByUsers) { // departmentHeadId.append(departmentHeadByUser.getId()).append(","); -// String workwechat = departmentHeadByUser.getWorkwechat(); -// if (workwechat == null || "".equals(workwechat)) { -// workwechat = departmentHeadByUser.getWechat(); -// } -// departMentHeadQyWxName.append(workwechat + ","); // } departmentHeadId = new StringBuilder("78").append(","); - departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); 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 2e11f7f1..a53e2172 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -668,17 +668,10 @@ public class GroupController { // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); -// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); -// if (workwechat == null || "".equals(workwechat)) { -// workwechat = departmentHeadByUsers.get(i).getWechat(); -// } -// departMentHeadQyWxName.append(workwechat + ","); // } departmentHeadId = new StringBuilder("78").append(","); - departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前提交数 List params = (List) map.get("params"); @@ -835,17 +828,10 @@ public class GroupController { // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user - StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { // departmentHeadId.append(departmentHeadByUsers.get(i).getId()).append(","); -// String workwechat = departmentHeadByUsers.get(i).getWorkwechat(); -// if (workwechat == null || "".equals(workwechat)) { -// workwechat = departmentHeadByUsers.get(i).getWechat(); -// } -// departMentHeadQyWxName.append(workwechat + ","); // } departmentHeadId = new StringBuilder("78").append(","); - departMentHeadQyWxName = new StringBuilder("PangFuZhen").append(","); map.put("departmenthead", departmentHeadId.toString()); // 获取当前部门所拥有的仓库