修复特种设备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

@@ -64,6 +64,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
@@ -2026,6 +2027,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             this.updateById(orgUsr);
             BeanUtils.copyProperties(orgUsr, result);
         } else {
+            if(OrgPersonVo.getDynamicFormValue() == null || OrgPersonVo.getDynamicFormValue().size() == 0) {
+                throw new BadRequest("人员动态表单信息未填写");
+            }
             result = saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
         }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/controller/UnitPersonController.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.UnitPersonInfoDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.entity.UnitInfo;
@@ -90,11 +91,15 @@ public class UnitPersonController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
-	public ResponseModel<?> saveOrgUsr(@RequestBody UnitPersonInfoDto unitPersonInfoDto)  {
+	public ResponseModel saveOrgUsr(@RequestBody UnitPersonInfoDto unitPersonInfoDto)  {
 		if (ValidationUtil.isEmpty(unitPersonInfoDto.getParentId())) {
 			throw new BadRequest("参数校验失败.");
 		}
-		return ResponseHelper.buildResponse( iUnitPersonService.saveUser(unitPersonInfoDto));
+			try {
+			return CommonResponseUtil.success( iUnitPersonService.saveUser(unitPersonInfoDto));
+		} catch (Exception e) {
+			return CommonResponseUtil.failure(e.getMessage());
+		}
 	}
 
 	/**

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/UnitPersonServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
@@ -18,13 +16,10 @@ import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
-import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
-import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DynamicFormColumnServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
-import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
 import com.yeejoin.amos.boot.module.tzs.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonEducationDto;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.PersonQualityDto;
@@ -41,7 +36,6 @@ import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -213,7 +207,7 @@ public class UnitPersonServiceImpl  implements IUnitPersonService {
                 BeanUtils.copyProperties(result,unitPersonInfoDto);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new BadRequest(e.getMessage());
         }
         return unitPersonInfoDto;
     }