1/31 刷新专利法律事务

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -97,12 +97,6 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Integer addMessage(Object object, List<MultipartFile> files) {
-        EventDTO eventDTO = (EventDTO) object;
-        //检查事件格式
-        if (eventDTO.getScenarioId() == null) {
-            throw new XiaoShiException("参数错误");
-        }
-
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
         try {
@@ -110,16 +104,11 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
         } catch (Exception e) {
             throw new UnLoginException("未登录");
         }
+        this.checkParameter(object);
+        EventDTO eventDTO = (EventDTO) object;
 
         //根据名称查询是否重复
         eventDTO.setName(eventDTO.getName().trim());
-        String name = eventDTO.getName();
-        LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Event::getName, name);
-        List<Event> events = this.list(queryWrapper);
-        if (events != null && events.size() != 0) {
-            throw new XiaoShiException("名称重复");
-        }
 
         //事件入库
         Event event = new Event();
@@ -184,16 +173,10 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
             throw new XiaoShiException("参数错误");
 
         }
+        this.checkParameter(object);
         Event event = this.getById(updateEventDTO.getId());
         //根据名称查询是否重复
         updateEventDTO.setName(updateEventDTO.getName().trim());
-        String name = updateEventDTO.getName();
-        LambdaQueryWrapper<Event> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Event::getName, name);
-        List<Event> events = this.list(queryWrapper);
-        if (!updateEventDTO.getName().equals(event.getName()) && events.size() != 0) {
-            throw new XiaoShiException("名称重复");
-        }
         BeanUtils.copyProperties(updateEventDTO, event);
         event.updateById();
 
@@ -472,25 +455,48 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
 
     /**
      * 参数检查
+     *
      * @param object
      */
     public void checkParameter(Object object) {
-          String name =null;
-          Integer id =null;
-          Integer scenarioId =null;
+      PersonnelVO  personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+
+        String name = null;
+        Integer id = null;
+        Integer scenarioId = null;
         if (object instanceof EventDTO) {
             EventDTO eventDTO = (EventDTO) object;
-               eventDTO.getScenarioId();
-               name =eventDTO.getName();
-               scenarioId =eventDTO.getScenarioId();
-        }
-        else if(object instanceof UpdateEventDTO)
-        {
+            eventDTO.getScenarioId();
+            name = eventDTO.getName();
+            scenarioId = eventDTO.getScenarioId();
+        } else if (object instanceof UpdateEventDTO) {
             UpdateEventDTO eventDTO = (UpdateEventDTO) object;
             eventDTO.getScenarioId();
-            name =eventDTO.getName();
-            scenarioId =eventDTO.getScenarioId();
-            id =eventDTO.getId();
+            name = eventDTO.getName();
+            scenarioId = eventDTO.getScenarioId();
+            id = eventDTO.getId();
+        }
+
+        //检验名称是否为空
+        if (name == null || name.trim().equals("")) {
+            throw new XiaoShiException("请输入名称");
+        }
+
+        //检验是否传入应用场景
+        if(scenarioId==null){
+            throw new XiaoShiException("请选择应用场景");
+        }
+
+        //检验名称是否重复
+        LambdaQueryWrapper<Event> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.eq(Event::getName,name)
+                .eq(Event::getTenantId,personnelVO.getTenantId());
+        if(id!=null){
+            queryWrapper.ne(Event::getId,id);
+        }
+        Event event =this.getOne(queryWrapper,false);
+        if(event!=null){
+            throw  new XiaoShiException("名称重复");
         }
 
 

src/main/resources/jsons/event.json

@@ -50,19 +50,6 @@
     "ifShow": "true"
   },
   {
-    "name": "客户",
-    "type": "String",
-    "value": "clientName",
-    "field": "clientName",
-    "sqlField": "client_id",
-    "sqlClass": "getClientNameSql",
-    "orderClass": "getClientNameOrder",
-    "ifSearch": "true",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "ifAsCondition": "true"
-  },
-  {
     "name": "发生时间",
     "type": "DateTime",
     "value": "eventDate",