修改bug

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import ch.qos.logback.core.net.SyslogOutputStream;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -394,32 +395,32 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
 			map.put("personNumber", req.get("personNumber"));
 		}
-		if (req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
+		if (req!=null&&req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
 			req.put("company", req.get("company"));
 		}
 
-		if (req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
+		if (req!=null&&req.containsKey("bizOrgCode") && !ObjectUtils.isEmpty(req.get("bizOrgCode"))) {
 			LambdaQueryWrapper<OrgUsr> query = new LambdaQueryWrapper<>();
 			query.eq(OrgUsr::getBizOrgCode, req.get("bizOrgCode").toString());
 			OrgUsr orgUsr = this.getOne(query);
 			req.remove("bizOrgCode");
 			map.put("company", orgUsr.getSequenceNbr().toString());
 		}
-
 		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
-		if (req.get("parentId") != null && req.get("parentId") != "") {
+		if (!req.isEmpty()&&req.containsKey("parentId") && req.get("parentId") != null && req.get("parentId") != "") {
 			OrgUsr parent = this.getById(req.get("parentId").toString());
 			map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
 		}
+
 		// 新加
-		if (req.get("OrgCode") != null && req.get("OrgCode") != "") {
+		if (!req.isEmpty() &&req.containsKey("OrgCode") && req.get("OrgCode") != null && req.get("OrgCode") != "") {
 
 			map.put("bizOrgCode", req.get("OrgCode"));
 			req.remove("OrgCode");
 		}
 
 		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
-		if (req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
+		if (!req.isEmpty()&&req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
 			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
 		}