fix：wx_open_user_id修改

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -144,4 +144,17 @@ public interface StaffApiService {
 	 * @date 2021-12-21 17:23:36
 	 */
 	List<StaffDTO> listByOpenUserIdsAndWxEnterpriseId(List<String> openUserIds, String wxEnterpriseId);
+
+
+	/**
+	 * 更新开放用户id,用户id
+	 *
+	 * @param wxEnterpriseId wx企业标识
+	 * @param wxUserId       wx用户id
+	 * @param wxOpenUseId    wx开放使用id
+	 * @return int
+	 * @author mozhu
+	 * @date 2021-12-21 19:53:30
+	 */
+	int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -1483,4 +1483,9 @@ public class StaffApiServiceImpl implements StaffApiService {
         return EntityUtil.changeEntityListNew(StaffDTO.class, staffMapper.listByOpenUserIdsAndWxEnterpriseId(openUserIds, wxEnterpriseId));
     }
 
+    @Override
+    public int updateOpenUserIdsByUserId(String wxEnterpriseId, String wxUserId, String wxOpenUseId) {
+        return staffService.updateOpenUserIdsByUserId(wxEnterpriseId, wxUserId, wxOpenUseId);
+    }
+
 }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/AdminController.java

@@ -70,15 +70,17 @@ public class AdminController extends WebBaseController {
                 vo.setRoleName("管理员");
                 List<AdminRoleVO> roleList = new ArrayList<>();
                 List<DepartmentDTO> departmentList = staffDTO.getDepartmentList();
-                for (DepartmentDTO departmentDTO : departmentList) {
-                    AdminRoleVO role = new AdminRoleVO();
-                    role.setDepartmentName(departmentDTO.getDepartmentName());
-                    role.setUserName(staffDTO.getStaffName());
-                    role.setUserPhone(staffDTO.getPhoneNumber());
-                    roleList.add(role);
+                if (CollectionUtils.isNotEmpty(departmentList)) {
+                    for (DepartmentDTO departmentDTO : departmentList) {
+                        AdminRoleVO role = new AdminRoleVO();
+                        role.setDepartmentName(departmentDTO.getDepartmentName());
+                        role.setUserName(staffDTO.getStaffName());
+                        role.setUserPhone(staffDTO.getPhoneNumber());
+                        roleList.add(role);
+                    }
+                    vo.setRoleUser(roleList);
+                    resultList.add(vo);
                 }
-                vo.setRoleUser(roleList);
-                resultList.add(vo);
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1, resultList);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -8,6 +8,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.MaidianLogDTO;
 import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
+import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.QywxXcxSendMessageQo;
@@ -17,6 +18,7 @@ import com.gic.wechat.api.dto.qywx.QywxNewUseridDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
@@ -72,6 +73,8 @@ public class TestController extends WebBaseController {
     private WxEnterpriseApiService wxEnterpriseApiService;
     @Autowired
     private QywxUserApiService qywxUserApiService;
+    @Autowired
+    private StaffApiService staffApiService;
 
     @RequestMapping("/send-message-test")
     public HaobanResponse testSendMessage(QywxXcxSendMessageQo qo) {
@@ -238,10 +241,16 @@ public class TestController extends WebBaseController {
 
 
     @RequestMapping("/useridToOpenuserid")
-    public HaobanResponse useridToOpenuserid(String corpid, String suiteId, String userids) {
-        String[] split = userids.split(",");
-        List<String> useridList = Arrays.stream(split).collect(Collectors.toList());
-        List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, suiteId, useridList);
+    public HaobanResponse useridToOpenuserid(String corpid, String suiteId, String wxEnterpriseId) {
+        //批量处理wx_user_id to wx_open_user_id
+        List<StaffDTO> staffDTOS = staffApiService.listUserIdByWxEnterpriseId(wxEnterpriseId);
+        logger.info("useridToOpenuserid请求：corpid：{}", corpid);
+        List<QywxNewUseridDTO> qywxNewUseridDTOS = qywxUserApiService.useridToOpenuserid(corpid, suiteId, staffDTOS.stream().map(StaffDTO::getWxUserId).collect(Collectors.toList()));
+        if (CollectionUtils.isNotEmpty(qywxNewUseridDTOS)) {
+            for (QywxNewUseridDTO qywxNewUseridDTO : qywxNewUseridDTOS) {
+                staffApiService.updateOpenUserIdsByUserId(wxEnterpriseId, qywxNewUseridDTO.getUserid(), qywxNewUseridDTO.getOpen_userid());
+            }
+        }
         return resultResponse(HaoBanErrCode.ERR_1, qywxNewUseridDTOS);
     }
 }