【新增】缩短码查询修改

src/main/java/io/office/modules/manage/controller/ShortCodeController.java

@@ -114,9 +114,21 @@ public class ShortCodeController {
         searchgtinlogEntity.setCreatedate(new Date());
         searchgtinlogEntity.setIp(IPUtils.getIpAddr(request));
 
+
+        if(StringUtils.isBlank(shortCodeVo.getShortCode())&&StringUtils.isBlank(shortCodeVo.getFirmName())&&StringUtils.isBlank(shortCodeVo.getRegisterAddress())) {
+            return R.error("请输入查询条件！");
+        }
+
         if(StringUtils.isNotBlank(shortCodeVo.getShortCode())) {
             searchgtinlogEntity.setKeyword(shortCodeVo.getShortCode());
             searchgtinlogEntity.setClassStr("缩短码查询：缩短码查询");
+            if(shortCodeVo.getShortCode().length()<7) {
+                return R.error("条码位数太少！请输入正确的8位商品条码！");
+            }
+            if(shortCodeVo.getShortCode().length()==8) {
+                shortCodeVo.setShortCode(shortCodeVo.getShortCode().substring(0,7));
+            }
+
         }
         if(StringUtils.isNotBlank(shortCodeVo.getFirmName())) {
             searchgtinlogEntity.setKeyword(shortCodeVo.getFirmName());
@@ -127,6 +139,8 @@ public class ShortCodeController {
             searchgtinlogEntity.setKeyword(shortCodeVo.getRegisterAddress());
             searchgtinlogEntity.setClassStr("缩短码查询：厂商地址查询");
         }
+
+
         searchgtinlogEntity.setSearchsource(0);
         //新增查询日志
         searchgtinlogService.save(searchgtinlogEntity);