Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -191,11 +191,11 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             }
         });
         String userId = remoteSecurityService.getAgencyUser().getUserId();
+        vo.setRecUserId(userId);
         // 冗余名称，数据同步使用
         this.setChargePersonName(vo);
         String s = String.valueOf(System.currentTimeMillis());
         vo.setId(s);
-        vo.setRecUserId(userId);
         vo.setSort(s);
         DynamicFormGroup dynamicFormGroup = iEqDynamicFormGroupService.getById(vo.getFormGroupId());
         vo.setSystemType(dynamicFormGroup.getRelationId() != null ? dynamicFormGroup.getRelationId().toString() : "");
@@ -273,8 +273,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
     }
 
     private void setChargePersonName(FireFightingSystemVo vo) {
-        if (StringUtil.isNotEmpty(vo.getChargePerson())) {
-            FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.queryByUserId(vo.getChargePerson());
+        if (StringUtil.isNotEmpty(vo.getRecUserId())) {
+            FeignClientResult<AgencyUserModel> result = Privilege.agencyUserClient.queryByUserId(vo.getRecUserId());
             AgencyUserModel userModel = result == null ? new AgencyUserModel() : result.getResult();
             vo.setChargePersonName(userModel.getRealName());
         }