From d9a4a01dfbdbca71c89a9feb80f08fedc47cd2d0 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Wed, 26 Apr 2023 11:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository_manage/config/PortConfig.java | 32 ++++++------ .../DepositoryRecordController.java | 8 +-- .../controller/GroupController.java | 5 +- .../controller/PageController.java | 27 +++------- .../service/DepositoryService.java | 7 --- .../service/impl/CompanyServiceImpl.java | 34 ------------- .../impl/DepositoryRecordServiceImpl.java | 50 +++++++------------ .../service/impl/DepositoryServiceImpl.java | 25 ---------- .../service/impl/QyWxOperationService.java | 43 +++++++++------- .../utils/LinkInterfaceUtil.java | 40 --------------- .../templates/pages/split/split_edit.html | 2 +- .../depository_manage/OtherTest.java | 38 ++++++++++++++ 12 files changed, 108 insertions(+), 203 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java index 5a28f110..73bbe14b 100644 --- a/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java +++ b/src/main/java/com/dreamchaser/depository_manage/config/PortConfig.java @@ -33,15 +33,15 @@ public class PortConfig { /** * 获取相应部门的部门负责人 - * @param administration + * @param userToken 待获取人员 * @return */ - public static List findDepartmentHeadByUser(Administration administration, UserByPort userToken){ - String url = PortConfig.external_url + "/org/positionlist"; - Integer maindeparment = administration.getId(); + public static List findDepartmentHeadByUser(Integer maindeparment,UserByPort userToken){ + List userByPortList = new ArrayList<>(); + String url = PortConfig.external_url + "/staff/archiveslist"; Map map = new HashMap<>(); - map.put("organization",maindeparment.toString()); - map.put("incharge",1); + map.put("adminorg",maindeparment); + map.put("role",""); String jsonString = JSONObject.toJSONString(map); JSONObject paramObject = JSONObject.parseObject(jsonString); String post = null; @@ -56,18 +56,14 @@ public class PortConfig { if(list == null){ list = new JSONArray(); } - List userPostList = new ArrayList<>(); - for (Object o : list) { - Post userPost = JSONObject.toJavaObject((JSONObject) o, Post.class); - userPostList.add(userPost); - } - List userByPortList = new ArrayList<>(); - for (Post value : userPostList) { - Map param = new HashMap<>(); - Post userPost = value; - param.put("position", userPost.getId()); - List userByPorts = LinkInterfaceUtil.FindUserByMap(param, userToken); - userByPortList.addAll(userByPorts); + + for (Object obj:list + ) { + JSONObject jsonObject1 = (JSONObject) obj; + int personincharge = jsonObject1.getInteger("personincharge"); + if(1 == personincharge){ + userByPortList.add(JSONObject.toJavaObject(jsonObject1, UserByPort.class)); + } } return userByPortList; } 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 5d14a304..4a6c8444 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -525,7 +525,7 @@ public class DepositoryRecordController { String crypt = Md5.crypt(header); map.put("applicantId", userToken.getId()); // 获取当前部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -1037,7 +1037,7 @@ public class DepositoryRecordController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { @@ -1461,7 +1461,7 @@ public class DepositoryRecordController { } else if ("out".equals(type)) { // 获取部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (UserByPort departmentHeadByUser : departmentHeadByUsers) { @@ -1725,7 +1725,7 @@ public class DepositoryRecordController { sumQuantity += integer; } // 获取部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken, crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); StringBuilder departmentHeadId = new StringBuilder(); StringBuilder departMentHeadQyWxName = new StringBuilder(); // for (int i = 0; i < departmentHeadByUsers.size(); i++) { 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 3258aedf..82c3925e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -2,6 +2,7 @@ package com.dreamchaser.depository_manage.controller; import cn.hutool.core.lang.Snowflake; import com.alibaba.fastjson.JSONObject; +import com.dreamchaser.depository_manage.config.PortConfig; import com.dreamchaser.depository_manage.entity.*; import com.dreamchaser.depository_manage.exception.MyException; import com.dreamchaser.depository_manage.pojo.GroupInfoP; @@ -607,7 +608,7 @@ public class GroupController { String crypt = Md5.crypt(header); map.put("applicantId", userToken.getId()); // 获取当前部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user @@ -779,7 +780,7 @@ public class GroupController { String crypt = Md5.crypt(header); map.put("applicantId", userToken.getId()); // 获取当前部门负责人 - List departmentHeadByUsers = LinkInterfaceUtil.findDepartmentHeadByUser(userToken,crypt); + List departmentHeadByUsers = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); // 部门负责人id StringBuilder departmentHeadId = new StringBuilder(); // 部门负责人企业微信user diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index e67f7431..fdebcf74 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2799,29 +2799,14 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); ModelAndView mv = new ModelAndView(); - // 获取仓储中心详情 -// Administration company = LinkInterfaceUtil.getCompany(361, userToken); - // 获取仓储中心负责人 -// List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, userToken); StringBuilder departmentHeadName = new StringBuilder(); StringBuilder departmentHeadId = new StringBuilder(); - // 获取当前userAgent - String header = request.getHeader("user-agent"); - String crypt = Md5.crypt(header); - // 获取当前用户部门对应企业微信中的部门信息 - JSONObject userPortByQyWx = PortConfig.getUserPortByQyWx(userToken.getMaindeparment()); - Integer portByQyWxInteger = userPortByQyWx.getInteger("wechatorganizationid"); - // 获取当前部门信息 - qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(crypt, portByQyWxInteger); - // 获取当前部门的负责人列表 - List department_leader = qyWxDepartment.getDepartment_leader(); - for (String department : - department_leader) { - // 通过userId获取对应用户信息 - Map portInfo = PortConfig.findUserByQyWxUserId(department); - UserByPort userByPort = (UserByPort) portInfo.get("user"); - departmentHeadName.append(userByPort.getName()).append(","); - departmentHeadId.append(userByPort.getNumber()).append(","); + + List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(),userToken); + for (UserByPort departmentHead:departmentHeadByUser + ) { + departmentHeadName.append(departmentHead.getName()).append(","); + departmentHeadId.append(departmentHead.getNumber()).append(","); } mv.addObject("departmentHeadName", departmentHeadName.toString()); mv.addObject("departmentHeadId", departmentHeadId.toString()); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java index 1ca0614a..aab8de0e 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/DepositoryService.java @@ -231,12 +231,5 @@ public interface DepositoryService { */ List getTodayInventoryInfoByDidAndMt(Integer did); - /** - * 用于获取当前仓库所属部门领导的企业微信id - * @param depositoryId 待查询仓库id - * @param userAgent userAgent - * @return - */ - List getDepositoryAdminorgLeaders(String depositoryId,String userAgent); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java index 10e297d4..68e481bd 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/CompanyServiceImpl.java @@ -617,38 +617,4 @@ public class CompanyServiceImpl implements CompanyService { } } - - - /** - * 用于获取当前部门的负责人 - * @param map - * @param userToken - * @return - */ - public List findDepartmentHeadByUser(Map map,UserByPort userToken){ - String url = PortConfig.external_url + "/staff/archiveslist"; - String jsonString = JSONObject.toJSONString(map); - JSONObject paramObject = JSONObject.parseObject(jsonString); - String post = null; - try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); - } catch (IOException e) { - e.printStackTrace(); - } - JSONObject jsonObject = JSONObject.parseObject(post); - JSONObject data = (JSONObject) jsonObject.get("data"); - JSONArray list = (JSONArray) data.get("list"); - if(list == null){ - list = new JSONArray(); - } - List DepartmentHeads = new ArrayList<>(); - for (int i = 0; i < list.size(); i++) { - UserByPort userByPort = JSONObject.toJavaObject((JSONObject) list.get(i), UserByPort.class); - /*if(userByPort.getPersonincharge() == 1){ - DepartmentHeads.add(userByPort); - }*/ - DepartmentHeads.add(userByPort); - } - return DepartmentHeads; - } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index e805f726..c05d66bc 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -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 otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); - for (String s : otherDepartmentIdList) { - Map userByQyWxUserId = PortConfig.findUserByQyWxUserId(s); - UserByPort user = (UserByPort) userByQyWxUserId.get("user"); - depositoryManager.append(user.getId()).append(","); + List 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 otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); - for (String s:otherDepartmentIdList - ) { - Map userByQyWxUserId = PortConfig.findUserByQyWxUserId(s); - UserByPort otherDepartment = (UserByPort) userByQyWxUserId.get("user"); - QyWxUid.append(s).append(","); - depositoryManager.append(otherDepartment.getId()).append(","); + + List 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 departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, userToken); + List 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 departmentHeadByUser = PortConfig.findDepartmentHeadByUser(company, null); + List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(361,null); StringBuilder depositoryManager = new StringBuilder(); StringBuilder QyWxUid = new StringBuilder(); // for (int i = 0; i < departmentHeadByUser.size(); i++) { diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index 1c4fcfa2..dbf12257 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -856,31 +856,6 @@ public class DepositoryServiceImpl implements DepositoryService { } - /** - * 用于获取当前仓库所属部门领导的企业微信id - * - * @param depositoryId 待查询仓库id - * @param userAgent userAgent - * @return - */ - @Override - public List getDepositoryAdminorgLeaders(String depositoryId, String userAgent) { - - // 获取当前选中的仓库 - Depository depositoryById = depositoryMapper.findDepositoryById(Integer.parseInt(depositoryId)); - // 获取当前仓库所属的部门 - 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 otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); - return otherDepartmentIdList; - - } private boolean hasDepository(List list, Depository o) { boolean flag = false; 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 d4047262..d9b268ad 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 @@ -1410,7 +1410,7 @@ public class QyWxOperationService { Integer flagForOpenDepository = mainRecord.getFlagForOpenDepository(); // 事先定义其他部门负责人列表 - List otherDepartmentIdList = null; + List otherDepartmentIdList = new ArrayList<>(); // 获取当前出库明细 List minRecordList = depositoryRecordMapper.findApplicationOutRecordMinByParent(mainId); @@ -1436,6 +1436,17 @@ public class QyWxOperationService { List approval_template_approver_list = new ArrayList<>(); + List userIdList = new ArrayList<>(); + List departmentHeadForUserToken = PortConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userToken); + for (UserByPort departmentHead:departmentHeadForUserToken + ) { + String departmentHeadWorkwechat = departmentHead.getWorkwechat(); + if(departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)){ + departmentHeadWorkwechat = departmentHead.getWechat(); + } + userIdList.add(departmentHeadWorkwechat); + } + // 获取当前登录用户部门与企业微信部门对照 JSONObject userPortByQyWx = PortConfig.getUserPortByQyWx(userToken.getMaindeparment()); String portName = userPortByQyWx.getString("name"); @@ -1444,11 +1455,7 @@ public class QyWxOperationService { // 用于设置部门负责人流程 Approval_template_approver approval_template_approver_departMentHeader = new Approval_template_approver(); approval_template_approver_departMentHeader.setAttr(1); - // 获取当前部门信息 - qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger); - // 获取部门负责人id列表 -// List userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); - List userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); + userIdList = new ArrayList<>(Collections.singleton("PangFuZhen")); approval_template_approver_departMentHeader.setUserid(userIdList); @@ -1771,14 +1778,16 @@ public class QyWxOperationService { Depository depositoryById = depositoryMapper.findDepositoryById(mainRecord.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列表 -// otherDepartmentIdList = new ArrayList<>(wxDepartment.getDepartment_leader()); + + List departmentHeadByUser = PortConfig.findDepartmentHeadByUser(ObjectFormatUtil.toInteger(adminorg), userToken); + for (UserByPort departmentHead:departmentHeadByUser + ) { + String departmentHeadWorkwechat = departmentHead.getWorkwechat(); + if(departmentHeadWorkwechat == null || "".equals(departmentHeadWorkwechat)){ + departmentHeadWorkwechat = departmentHead.getWechat(); + } + otherDepartmentIdList.add(departmentHeadWorkwechat); + } otherDepartmentIdList = new ArrayList(Collections.singleton("PangFuZhen")); @@ -1831,11 +1840,7 @@ public class QyWxOperationService { String s = HttpUtils.doPost(url, jsonString); JSONObject jsonObject = JSONObject.parseObject(s); - if (otherDepartmentIdList != null) { - jsonObject.put("otherDepartmentIdList", JSONObject.toJSONString(otherDepartmentIdList)); - } else { - jsonObject.put("otherDepartmentIdList", "[]"); - } + jsonObject.put("otherDepartmentIdList", JSONObject.toJSONString(otherDepartmentIdList)); return jsonObject; } diff --git a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java index 921f3c41..388c9e99 100644 --- a/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java +++ b/src/main/java/com/dreamchaser/depository_manage/utils/LinkInterfaceUtil.java @@ -260,46 +260,6 @@ public class LinkInterfaceUtil { return result; } - /** - * 获取当前登录用户的部门负责人 - * - * @param user - * @return - */ - public static List findDepartmentHeadByUser(UserByPort user, String userAgent) { - List DepartmentHeads = new ArrayList<>(); - if (Integer.compare(user.getId(), 119) == 0) { - // 如果申请人id为106 - DepartmentHeads.add(user); - return DepartmentHeads; - } - if (Integer.compare(user.getMaindeparment(), 361) == 0) { - // 如果申请人部门为仓储 - UserByPort userByPort = FindUserById(119, user); - DepartmentHeads.add(userByPort); - return DepartmentHeads; - } - // 获取当前登录用户部门与企业微信部门对照 - JSONObject userPortByQyWx = PortConfig.getUserPortByQyWx(user.getMaindeparment()); - String portName = userPortByQyWx.getString("name"); - Integer portByQyWxInteger = userPortByQyWx.getInteger("wechatorganizationid"); - - qywxDepartment qyWxDepartment = QyWxConfig.getQyWxDepartment(userAgent, portByQyWxInteger); - // 获取部门负责人id列表 - List userIdList = new ArrayList<>(qyWxDepartment.getDepartment_leader()); - for (String userId : userIdList - ) { - - Map portInfo = PortConfig.findUserByQyWxUserId(userId); - UserByPort userByPort = (UserByPort) portInfo.get("user"); - if (userByPort != null) { - DepartmentHeads.add(userByPort); - } - } - return DepartmentHeads; - } - - /** * 用于获取行政组织树 * diff --git a/src/main/resources/templates/pages/split/split_edit.html b/src/main/resources/templates/pages/split/split_edit.html index ad7fc10a..d740c7c0 100644 --- a/src/main/resources/templates/pages/split/split_edit.html +++ b/src/main/resources/templates/pages/split/split_edit.html @@ -172,7 +172,7 @@ $("#quantity").attr("readonly","readonly"); $("#newUnit").attr("readonly","readonly"); } - }) + }); form.on('submit(formStep)', function (data) { if(!flagForForm){ flagForForm = true; diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java index 2ef3a814..590404a2 100644 --- a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -1,5 +1,6 @@ package com.dreamchaser.depository_manage; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.dreamchaser.depository_manage.config.PortConfig; @@ -24,6 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import org.w3c.dom.ls.LSInput; import java.io.IOException; import java.text.SimpleDateFormat; @@ -53,6 +55,42 @@ public class OtherTest { // approvalInfo.setApprover(approver); // depositoryRecordService.reviewByQyWxApprovalIn("[10, 11]",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240015"); // stockTakingService.reviewByQyWxApproval("4",approvalInfo,"42156e781cdc727e7d5deac872be45a9","2","202304240042"); + UserByPort userByPort = LinkInterfaceUtil.FindUserById(119, null); + List departmentHeadByUser = findDepartmentHeadByUser(userByPort.getMaindeparment(),userByPort); + System.out.println(departmentHeadByUser); + } + + + public static List findDepartmentHeadByUser(Integer maindeparment,UserByPort userToken){ + List userByPortList = new ArrayList<>(); + String url = PortConfig.external_url + "/staff/archiveslist"; + Map map = new HashMap<>(); + map.put("adminorg",maindeparment); + map.put("role",""); + String jsonString = JSONObject.toJSONString(map); + JSONObject paramObject = JSONObject.parseObject(jsonString); + String post = null; + try { + post = HttpUtils.send(url, paramObject, HTTP.UTF_8,userToken); + } catch (IOException e) { + e.printStackTrace(); + } + JSONObject jsonObject = JSONObject.parseObject(post); + JSONObject data = (JSONObject) jsonObject.get("data"); + JSONArray list = (JSONArray) data.get("list"); + if(list == null){ + list = new JSONArray(); + } + + for (Object obj:list + ) { + JSONObject jsonObject1 = (JSONObject) obj; + int personincharge = jsonObject1.getInteger("personincharge"); + if(1 == personincharge){ + userByPortList.add(JSONObject.toJavaObject(jsonObject1, UserByPort.class)); + } + } + return userByPortList; }