Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-lxh

jyzb-biz/src/main/java/com/junmp/jyzb/controller/ES/CrudController.java

@@ -57,6 +57,7 @@ public class CrudController {
     @PostMapping("UpdateES")
     public Object UpdateES() {
         pubOrgService.AddToEs();
+
         equipmentTypeService.addEs();
         equipmentSizeService.addEs();
         busFormService.addEs();

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -65,6 +65,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
         QueryEquipmentTypeReq req =new QueryEquipmentTypeReq();
         req.setType(0);
         List<EquipmentType> esDto=this.list();
+        typeRepository.deleteAll();
         return typeRepository.saveAll(esDto);
     }
 

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java

@@ -59,7 +59,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
         processTemplates.setTemplateId(templateId);
         processTemplates.setFormName(req.getFormName());
         processTemplates.setRemark(req.getRemark());
-        processTemplates.setIsStop(true);
+        processTemplates.setIsStop(false);
         Date date= new Date();
         processTemplates.setUpdated(date);
         processTemplateService.save(processTemplates);