Bug 2870 查询传递参数为Long 如库中sequence_nbr仅末尾数字不同的相连数据 会查询多条。 修改为string 测试无异常。

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

@@ -359,9 +359,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
             map.put("personNumber", req.get("personNumber"));
         }
-
-        OrgUsr parent = this.getById(Long.valueOf(req.get("parentId").toString()));
+        /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
+        if (req.get("parentId") != null && req.get("parentId") != ""){
+            OrgUsr parent = this.getById(req.get("parentId").toString());
             map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
+        }
+        /*BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始*/
+
         req.remove("bizOrgName");
         req.remove("pageSize");
         req.remove("pageNum");
@@ -1004,7 +1008,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             }
             CompanyPerson company = new CompanyPerson();
             BeanUtils.copyProperties(org, company);
-            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey(), false));
+            company.setPersons(this.queryForListByParentIdAndOrgType(org.getSequenceNbr(), OrgPersonEnum.人员.getKey()));
             return company;
         }).filter(c -> {
             return c != null;
@@ -1424,6 +1428,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgUsr> orgUsrList = this.baseMapper.selectList(wrapper);
         return orgUsrList;
     }
+
+
 }