Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzsUserInfoDto.java

@@ -83,4 +83,7 @@ public class TzsUserInfoDto extends BaseDto {
     @ApiModelProperty(value = "设备绑定状态")
     private String state;
 
+    @ApiModelProperty(value = "任命文件")
+    private String appointDoc;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -88,6 +88,7 @@ public class TzsUserInfoController extends BaseController {
         }
         tzsUserInfo.setUnitName(companyModel.getCompanyName());
         tzsUserInfo.setUnitCode(companyModel.getCompanyCode());
+        tzsUserInfo.setAppointDoc(tzsUserInfo.getAppointDoc());
         tzsUserInfo.setRecDate(new Date());
 //        Map<String, Object> qualificationsInfo = (Map<String, Object>)map.get("qualificationsInfo");
 //        Object subForm = qualificationsInfo.get("subForm");
@@ -139,7 +140,9 @@ public class TzsUserInfoController extends BaseController {
         queryWrapper2.eq("sequence_nbr",rowId);
         queryWrapper2.eq("is_delete",false);
         TzsUserInfo selectOne = tzsUserInfoMapper.selectOne(queryWrapper2);
-        tzsUserInfoServiceImpl.deleteGroupAndPersonRelation(selectOne.getPostName(),selectOne.getAmosUserId());
+        if(!ObjectUtils.isEmpty(selectOne.getAmosUserId())){
+            tzsUserInfoServiceImpl.deleteGroupAndPersonRelation(selectOne.getPostName(),selectOne.getAmosUserId());
+        }
 
         tzsUserInfo.setUnitName(companyModel.getCompanyName());
         tzsUserInfo.setUnitCode(companyModel.getCompanyCode());