BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据 2021-09-09 by kongfm

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -961,7 +961,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             return null;
         }
         return ids.stream().map(m -> {
-            OrgUsr org = getById(m);
+            // BUG 2740 机场单位主键varchar 导致 通过主键搜索返回多条数据  2021 - 09 - 09by kongfm
+            OrgUsr org = getById(m.toString());
             if (ObjectUtils.isEmpty(org)) {
                 return null;
             }
@@ -975,7 +976,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
-        return this.queryForList(null, false, parentId, bizOrgType);
+        return Bean.toModels(this.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete,false).eq(OrgUsr::getParentId,parentId).eq(OrgUsr::getBizOrgType,bizOrgType)), this.getModelClass());
     }
 
     public OrgUsrDto getOrg(String amosUserId) {