Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!174

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceEnclosureController.java

@@ -76,8 +76,8 @@ public class TInsuranceEnclosureController {
 	/**
 	 * 删除商险附件
 	 *
-	 * @param id
-	 * @return
+	 * @param id 商险id
+	 * @return R
 	 * @Author zhaji
 	 * @Date 2022-08-23
 	 **/

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEnclosureServiceImpl.java

@@ -107,6 +107,9 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 	 */
 	@Override
 	public R getInsuranceEnclosureUrl(String id) {
+		if(Common.isEmpty(id)){
+			return R.failed("附件id为空");
+		}
 		TInsuranceEnclosure insuranceEnclosure = getById(id);
 		if (null == insuranceEnclosure) {
 			return R.failed("无对应附件信息");
@@ -126,11 +129,14 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 	 */
 	@Override
 	public R deleteInsuranceEnclosure(String id) {
+		if(Common.isEmpty(id)){
+			return R.failed("附件id为空");
+		}
+		TInsuranceEnclosure insuranceEnclosure = getById(id);
+		if (null == insuranceEnclosure) {
+			return R.failed("无对应附件信息");
+		}
 		try {
-			TInsuranceEnclosure insuranceEnclosure = getById(id);
-			if (null == insuranceEnclosure) {
-				return R.failed("无对应附件信息");
-			}
 			if (removeById(id)) {
 				ossUtil.deleteObject(null, insuranceEnclosure.getEnclosureAddress());
 				return R.ok("删除成功！");