fix:修改组织同步用户bug

@@ -16,7 +16,7 @@ import java.util.List;
 @Slf4j
 public class EnterpriseWeChatSmsSender extends AbstractMessageSender {
 
-  /** 钉钉参数配置 */
+  /** 企业微信参数配置 */
   private final EnterpriseWeChatConfiguration config;
 
   private String  accessToken;
@@ -24,33 +24,14 @@ public class EnterpriseWeChatSmsSender extends AbstractMessageSender {
   private  String url = "https://qyapi.weixin.qq.com/cgi-bin";
 
   private Long expirationTime;
-//
-//  private static final String smsText="{\n" +
-//          "  \"touser\": \"%s\",\n" +
-//          "  \"msgtype\": \"textcard\",\n" +
-//          "  \"agentid\": %s,\n" +
-//          "  \"textcard\": {\n" +
-//          "\"title\": \"平台告警通知\",\n" +
-//          "\"description\": \"<div class=\\\"normal\\\">设备所属组织：%s</div>" +
-//          "<div class=\\\"normal\\\">设备名称：%s</div>" +
-//          "<div class=\\\"normal\\\">告警等级：%s</div>" +
-//          "<div class=\\\"normal\\\">告警类型：%s</div>" +
-//          "<div class=\\\"normal\\\">触发值：%s</div>" +
-//          "<div class=\\\"normal\\\">告警时间：%s</div>\",\n" +
-//          "    \"url\": \" \",\n" +
-//          "    \"btntxt\": \"详情\"\n" +
-//          "  },\n" +
-//          "  \"enable_id_trans\": 0,\n" +
-//          "  \"enable_duplicate_check\": 0,\n" +
-//          "  \"duplicate_check_interval\": 1800\n" +
-//          "}";
+
 
   private static final String smsText="{\n" +
           "   \"touser\" : \"%s\",\n" +
           "   \"msgtype\" : \"text\",\n" +
           "   \"agentid\" : %s,\n" +
           "   \"text\" : {\n" +
-          "       \"content\" : \"平台告警通知\n设备所属组织：%s\n设备名称：%s\n告警等级：%s\n告警类型：%s\n触发值：%s\n告警时间：%s\n\"\n" +
+          "       \"content\" : \"平台告警通知\n设备所属组织：%s\n设备名称：%s\n告警等级：%s\n告警类型：%s\n触发值：%s\n告警时间：%s\n\"" +
           "   },\n" +
           "   \"safe\":0,\n" +
           "   \"enable_id_trans\": 0,\n" +

@@ -209,11 +209,13 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     List<Map<String,String>> userOrgList =  getUserOrgMap(getUserByOrganizationIds(parentId),getUserByOrganizationIds(sourceParentOrganizationId));
     baseMapper.updateById(organization);
     //组织修改过后更新原上级与目标上级用户绑定的组织
-    for (Map<String,String> userOrg:userOrgList){
-      String user = userOrg.get("userId");
-      String org =  userOrg.get("orgId");
-      List<String>orgIds = organizationAllIds(tenantId, org);
-      addOrUpdateUserOrganizationMapping(user,orgIds);
+    if(null!=userOrgList){
+      for (Map<String,String> userOrg:userOrgList){
+        String user = userOrg.get("userId");
+        String org =  userOrg.get("orgId");
+        List<String>orgIds = organizationAllIds(tenantId, org);
+        addOrUpdateUserOrganizationMapping(user,orgIds);
+      }
     }
     return organizationDTO;
   }
@@ -240,17 +242,21 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     //目标上级原本绑定的用户 newUserIds
     //原上级原本绑定的用户 oldUserIds
     List<Map<String,String>> userOrgList = new ArrayList<>();
-    for (String oldUserId:oldUserIds) {
-      Map<String,String> map  = new HashMap<>();
-      map.put("userId",oldUserId);
-      map.put("orgId",  getOrganizationIdsByUser(oldUserId).get(0));
-      userOrgList.add(map);
+    if(null!=newUserIds){
+      for (String newUserId:newUserIds) {
+        Map<String,String> map  = new HashMap<>();
+        map.put("userId",newUserId);
+        map.put("orgId",  getOrganizationIdsByUser(newUserId).get(0));
+        userOrgList.add(map);
+      }
     }
-    for (String newUserId:newUserIds) {
-      Map<String,String> map  = new HashMap<>();
-      map.put("userId",newUserId);
-      map.put("orgId",  getOrganizationIdsByUser(newUserId).get(0));
-      userOrgList.add(map);
+    if(null!=oldUserIds){
+      for (String oldUserId:oldUserIds) {
+        Map<String,String> map  = new HashMap<>();
+        map.put("userId",oldUserId);
+        map.put("orgId",  getOrganizationIdsByUser(oldUserId).get(0));
+        userOrgList.add(map);
+      }
     }
     return userOrgList;
   }