修改监听人员修改

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -52,27 +53,24 @@ public class OrgUsrAgencyUserServiceImpl extends BaseService<OrgUsrAgencyUserDto
         if ("update".equals(methodName)) {
             // 更新cb_org_usr_agency_user
             JSONObject object = result.getJSONObject("result");
-            OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("amos_usr_id", object.getString("userId")));
-//            OrgUsrAgencyUser orgUsrAgencyUser = new OrgUsrAgencyUser();
+            OrgUsrAgencyUser orgUsrAgencyUser = orgUsrAgencyUserMapper.selectOne(new QueryWrapper<OrgUsrAgencyUser>().eq("amos_user_id", object.getString("userId")));
             orgUsrAgencyUser.setUsrName(object.getString("userName"));
             orgUsrAgencyUser.setMobile(object.getString("mobile"));
             orgUsrAgencyUser.setAmosUserId(object.getString("userId"));
-            orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("amos_usr_id",object.getString("userId")));
+            orgUsrAgencyUserMapper.update(orgUsrAgencyUser,new QueryWrapper<OrgUsrAgencyUser>().eq("amos_user_id",object.getString("userId")));
             // 更新cb_firefighters
-            Firefighters firefighter = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("amos_usr_id", orgUsrAgencyUser.getOrgUsrId()));
-            if (!ObjectUtils.isEmpty(firefighter) && "0".equals(firefighter.getIsDelete())) {
-//                Firefighters firefighters = new Firefighters();
+            Firefighters firefighter = firefightersMapper.selectOne(new QueryWrapper<Firefighters>().eq("org_usr_id", orgUsrAgencyUser.getOrgUsrId()));
+            if (!ObjectUtils.isEmpty(firefighter) && !firefighter.getIsDelete()) {
                 firefighter.setAmosUserId(object.get("userId").toString());
                 firefighter.setAmosName(object.getString("userName"));
-                firefightersMapper.update(firefighter, new QueryWrapper<Firefighters>().eq("amos_usr_id", orgUsrAgencyUser.getOrgUsrId()));
+                firefightersMapper.update(firefighter, new QueryWrapper<Firefighters>().eq("org_usr_id", orgUsrAgencyUser.getOrgUsrId()));
             }
             // 更新cb_org_usr
             OrgUsr orgUsr1 = orgUsrMapper.selectById(orgUsrAgencyUser.getOrgUsrId());
-            orgUsrMapper.selectOne(new QueryWrapper<OrgUsr>().eq("amos_org_id",object.get("userId")));
-            if (!ObjectUtils.isEmpty(orgUsr1) && "0".equals(orgUsr1.getIsDelete())) {
-//                OrgUsr orgUsr = new OrgUsr();
+            if (!ObjectUtils.isEmpty(orgUsr1) && !orgUsr1.getIsDelete()) {
                 orgUsr1.setAmosOrgId(object.get("userId").toString());
-                orgUsr1.setAmosOrgCode(object.getString("userName"));
+                List<Map<String, Object>> companys = (List<Map<String, Object>>) object.get("companys");
+                orgUsr1.setAmosOrgCode(companys.get(0).get("orgCode").toString());
                 orgUsrMapper.update(orgUsr1,new QueryWrapper<OrgUsr>().eq("sequence_nbr",orgUsrAgencyUser.getOrgUsrId()));
             }
         } else if ("multDeleteUser".equals(methodName)) {