修改组织架构bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationImpl.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
@@ -88,7 +89,11 @@ public class OrganizationImpl extends BaseService<Organization, Organization, Or
                         List<String> valueList = new ArrayList<>();
                         for (int i = 0; i < nameList.size(); i++) {
                             if (telList.size() > i) {
-                                valueList.add(nameList.get(i) + "-" + telList.get(i));
+                                if (StringUtils.isEmpty(telList.get(i))) {
+                                    valueList.add(nameList.get(i));
+                                } else {
+                                    valueList.add(nameList.get(i) + "-" + telList.get(i));
+                                }
                             } else {
                                 valueList.add(nameList.get(i));
                             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrganizationUserImpl.java

@@ -86,7 +86,7 @@ public class OrganizationUserImpl extends BaseService<OrganizationUser,Organizat
         }
         wrapper.eq(OrganizationUser::getIsDelete, false);
         wrapper.orderByDesc(OrganizationUser::getSort);
-        wrapper.groupBy(OrganizationUser::getTelephone);
+        wrapper.groupBy(OrganizationUser::getSequenceNbr);
         return this.baseMapper.selectPage(page, wrapper);
     }