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 44175b84..0d845b92 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1649,7 +1649,7 @@ public class PageController { if ("".equals(s)) { continue; } - UserByPort manager = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), userToken); + UserByPort manager = PortConfig.findUserByPortByNumber(s); managerName.append(manager.getName() + ","); } stp.setDepartmentManagerName(managerName.toString()); @@ -1724,13 +1724,12 @@ public class PageController { // 负责人姓名 StringBuilder managerName = new StringBuilder(); String[] split = stp.getDepartmentManager().split(","); - for (int i = 0; i < split.length; i++) { - String s = split[i]; + for (String s : split) { if ("".equals(s)) { continue; } - UserByPort manager = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(s), userToken); - managerName.append(manager.getName() + ","); + UserByPort manager = PortConfig.findUserByPortByNumber(s); + managerName.append(manager.getName()).append(","); } stp.setDepartmentManagerName(managerName.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 79874895..02f708b5 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 @@ -2230,22 +2230,20 @@ public class QyWxOperationService { String departmentManager = mainRecord.getDepartmentManager(); String[] departmentManagers = departmentManager.split(","); - for (int i = 0; i < departmentManagers.length; i++) { - if ("".equals(departmentManagers[i])) { + for (String manager : departmentManagers) { + if ("".equals(manager)) { continue; } // 获取负责人信息 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(ObjectFormatUtil.toInteger(departmentManagers[i]), userToken); + UserByPort userByPort = PortConfig.findUserByPortByNumber(manager); Map contact_principal = new HashMap<>(); contact_principal.put("userid", userByPort.getWorkwechat()); contact_principal.put("name", userByPort.getName()); membersMap_principal.add(contact_principal); } - members_principal.put("members", membersMap_principal); approval_template_apply_data_contents_principal.setValue(members_principal); - // 添加到控件列表 approval_template_apply_data_contents_list.add(approval_template_apply_data_contents_principal); diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java new file mode 100644 index 00000000..0a8a7a64 --- /dev/null +++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java @@ -0,0 +1,26 @@ +package com.dreamchaser.depository_manage; + +import com.alibaba.fastjson.JSONObject; +import com.dreamchaser.depository_manage.config.QyWxConfig; +import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class TestOther { + + + @Autowired + QyWxOperationService qyWxOperationService; + + @Test + public void Test() { + JSONObject a = qyWxOperationService.getApprovalTemplateInfo("ecf4063aa615d97e7888e8a7232b2261", "C4RbNbd7KYKHGXimVTc5rkNdVWT92JURzoU4KTgbw"); + System.out.println(JSONObject.toJSONString(a)); + } +}