修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -448,6 +448,15 @@ public class FirefightersController extends BaseController {
     public ResponseModel<PeopleInfoDto> updatePeopleById(@RequestBody PeopleInfoDto firefighters, @PathVariable Long id) {
         try {
             if ("1601".equals(firefighters.getFirefighters().getPeopleType())){
+                QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
+                queryWrapper.eq("field_code", "peopleType");
+                queryWrapper.eq("instance_id", id);
+                DynamicFormInstance instance = dynamicFormInstanceMapper.selectOne(queryWrapper);
+                instance.setFieldValue(firefighters.getFirefighters().getPeopleType());
+                instance.setFieldValueLabel("驻站消防员");
+                dynamicFormInstanceMapper.updateById(instance);
+
                 PeopleBasicInfoDto peopleBasicInfoDto = firefighters.getFirefighters();
                 Firefighters firefighter = new Firefighters();
                 BeanUtils.copyProperties(peopleBasicInfoDto, firefighter);
@@ -490,16 +499,6 @@ public class FirefightersController extends BaseController {
                     iFirefightersService.updateById(firefighter);
                     ifirefightersContactsService.updateById(firefighters.getFirefightersContacts());
 
-                    QueryWrapper<DynamicFormInstance> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("group_code", OrgPersonEnum.人员.getCode());
-                    queryWrapper.eq("field_code", "peopleType");
-                    queryWrapper.eq("instance_id", id);
-                    DynamicFormInstance instance = dynamicFormInstanceMapper.selectOne(queryWrapper);
-                    if (!ObjectUtils.isEmpty(instance)) {
-                        instance.setFieldValue(firefighters.getFirefighters().getPeopleType());
-                        instance.setFieldValueLabel("驻站消防员");
-                        dynamicFormInstanceMapper.updateById(instance);
-                    }
 
                     // 删除缓存
                     redisUtils.del(RedisKey.FIREFIGHTERS_ID + firefighter.getSequenceNbr(),