Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationManageController.java

@@ -12,10 +12,12 @@ import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageS
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -224,8 +226,11 @@ public class JgUseRegistrationManageController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
     public ResponseModel<Page<JSONObject>> queryEquByCertificateSeqList(@RequestParam(value = "current") int current,
                                                                         @RequestParam(value = "size") int size,
-                                                                        @RequestParam(value = "enableType",required = false) String enableType,
-                                                                        @RequestParam(value = "sequenceNbrs") String sequenceNbrs) {
+                                                                        @RequestParam(value = "enableType", required = false) String enableType,
+                                                                        @RequestParam(value = "sequenceNbrs", required = false) String sequenceNbrs) {
+        if (ObjectUtils.isEmpty(sequenceNbrs)) {
+            throw new BadRequest("请先选择使用登记证");
+        }
         List<Long> collect = Arrays.stream(sequenceNbrs.split(","))
                 .map(Long::parseLong)
                 .collect(Collectors.toList());