调教获取维保账号是否被绑定使用的权限

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

@@ -664,23 +664,26 @@ public class MaintenanceCompanyServiceImpl
 	 * @return
 	 */
 	public MaintenanceCompany getMaintenanceCompany(String amosUserId) {
-		MaintenanceCompany maintenanceCompany;
-		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
-				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
-						.eq(DynamicFormInstance::getFieldValue, amosUserId));
-		if (ValidationUtil.isEmpty(dyFormInstance)) {
-			throw new BadRequest("维保账号不存在或未关联系统账号.");
-		}
-		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
-		if (ValidationUtil.isEmpty(person)) {
-			throw new BadRequest("维保账号不存在或未关联系统账号.");
-		}
-		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		wrapper.eq(MaintenanceCompany::getAmosId, amosUserId);
+		MaintenanceCompany maintenanceCompany =	this.baseMapper.selectOne(wrapper);
+//		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
+//				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
+//						.eq(DynamicFormInstance::getFieldValue, amosUserId));
 		if (ValidationUtil.isEmpty(maintenanceCompany)) {
 			throw new BadRequest("维保账号不存在或未关联系统账号.");
 		}
+//		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+//				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
+//		if (ValidationUtil.isEmpty(person)) {
+//			throw new BadRequest("维保账号不存在或未关联系统账号.");
+//		}
+//		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+//				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
+//		if (ValidationUtil.isEmpty(maintenanceCompany)) {
+//			throw new BadRequest("维保账号不存在或未关联系统账号.");
+//		}
 		return maintenanceCompany;
 	}