diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceEventServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceEventServiceImpl.java
index aef7aa9..ddfe7e9 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceEventServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeviceEventServiceImpl.java
@@ -5,18 +5,26 @@ import jnpf.mapper.RecycleDeviceEventMapper;
 import jnpf.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.model.recycledeviceevent.*;
+
 import java.math.BigDecimal;
+
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.util.GeneraterSwapUtil;
 import jnpf.database.model.superQuery.SuperQueryJsonModel;
 import jnpf.database.model.superQuery.ConditionJsonModel;
 import jnpf.database.model.superQuery.SuperQueryConditionModel;
+
 import java.lang.reflect.Field;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 import java.util.regex.Pattern;
+
 import jnpf.model.QueryModel;
+
 import java.util.stream.Collectors;
+
 import jnpf.base.model.ColumnDataModel;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,13 +33,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
 import java.text.SimpleDateFormat;
+
 import jnpf.util.*;
+
 import java.util.*;
+
 import jnpf.base.UserInfo;
 import jnpf.permission.entity.UserEntity;
+
 /**
- *
  * 设备事件
  * 版本： V3.5
  * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com）
@@ -39,7 +51,7 @@ import jnpf.permission.entity.UserEntity;
  * 日期： 2024-07-01
  */
 @Service
-public class RecycleDeviceEventServiceImpl extends ServiceImpl<RecycleDeviceEventMapper, RecycleDeviceEventEntity> implements RecycleDeviceEventService{
+public class RecycleDeviceEventServiceImpl extends ServiceImpl<RecycleDeviceEventMapper, RecycleDeviceEventEntity> implements RecycleDeviceEventService {
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
 
@@ -47,302 +59,318 @@ public class RecycleDeviceEventServiceImpl extends ServiceImpl<RecycleDeviceEven
     private UserProvider userProvider;
 
     @Override
-    public List<RecycleDeviceEventEntity> getList(RecycleDeviceEventPagination recycleDeviceEventPagination){
-        return getTypeList(recycleDeviceEventPagination,recycleDeviceEventPagination.getDataType());
+    public List<RecycleDeviceEventEntity> getList(RecycleDeviceEventPagination recycleDeviceEventPagination) {
+        return getTypeList(recycleDeviceEventPagination, recycleDeviceEventPagination.getDataType());
     }
-    /** 列表查询 */
+
+    /**
+     * 列表查询
+     */
     @Override
-    public List<RecycleDeviceEventEntity> getTypeList(RecycleDeviceEventPagination recycleDeviceEventPagination,String dataType){
-        String userId=userProvider.get().getUserId();
-        List<String> AllIdList =new ArrayList();
-        List<List<String>> intersectionList =new ArrayList<>();
+    public List<RecycleDeviceEventEntity> getTypeList(RecycleDeviceEventPagination recycleDeviceEventPagination, String dataType) {
+        String userId = userProvider.get().getUserId();
+        List<String> AllIdList = new ArrayList();
+        List<List<String>> intersectionList = new ArrayList<>();
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         String columnData = !isPc ? RecycleDeviceEventConstant.getAppColumnData() : RecycleDeviceEventConstant.getColumnData();
         ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
         String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
 
-        int total=0;
-        int recycleDeviceEventNum =0;
-        QueryWrapper<RecycleDeviceEventEntity> recycleDeviceEventQueryWrapper=new QueryWrapper<>();
+        int total = 0;
+        int recycleDeviceEventNum = 0;
+        QueryWrapper<RecycleDeviceEventEntity> recycleDeviceEventQueryWrapper = new QueryWrapper<>();
         List<String> allSuperIDlist = new ArrayList<>();
-        String superOp ="";
-        if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getSuperQueryJson())){
+        String superOp = "";
+        if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getSuperQueryJson())) {
             List<String> allSuperList = new ArrayList<>();
-            List<List<String>> intersectionSuperList  = new ArrayList<>();
+            List<List<String>> intersectionSuperList = new ArrayList<>();
             String queryJson = recycleDeviceEventPagination.getSuperQueryJson();
             SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
             int superNum = 0;
             QueryWrapper<RecycleDeviceEventEntity> recycleDeviceEventSuperWrapper = new QueryWrapper<>();
-            recycleDeviceEventSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceEventSuperWrapper,RecycleDeviceEventEntity.class,queryJson,"0"));
+            recycleDeviceEventSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceEventSuperWrapper, RecycleDeviceEventEntity.class, queryJson, "0"));
             int recycleDeviceEventNum1 = recycleDeviceEventSuperWrapper.getExpression().getNormal().size();
-            if (recycleDeviceEventNum1>0){
-                List<String> recycleDeviceEventList =this.list(recycleDeviceEventSuperWrapper).stream().map(RecycleDeviceEventEntity::getId).collect(Collectors.toList());
+            if (recycleDeviceEventNum1 > 0) {
+                List<String> recycleDeviceEventList = this.list(recycleDeviceEventSuperWrapper).stream().map(RecycleDeviceEventEntity::getId).collect(Collectors.toList());
                 allSuperList.addAll(recycleDeviceEventList);
                 intersectionSuperList.add(recycleDeviceEventList);
                 superNum++;
             }
             superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
             //and or
-            if(superOp.equalsIgnoreCase("and")){
+            if (superOp.equalsIgnoreCase("and")) {
                 allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
-            }else{
+            } else {
                 allSuperIDlist = allSuperList;
             }
         }
         List<String> allRuleIDlist = new ArrayList<>();
-        String ruleOp ="";
-        if (ObjectUtil.isNotEmpty(ruleJson)){
+        String ruleOp = "";
+        if (ObjectUtil.isNotEmpty(ruleJson)) {
             List<String> allRuleList = new ArrayList<>();
-            List<List<String>> intersectionRuleList  = new ArrayList<>();
+            List<List<String>> intersectionRuleList = new ArrayList<>();
             SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
             int ruleNum = 0;
             QueryWrapper<RecycleDeviceEventEntity> recycleDeviceEventSuperWrapper = new QueryWrapper<>();
-            recycleDeviceEventSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceEventSuperWrapper,RecycleDeviceEventEntity.class,ruleJson,"0"));
+            recycleDeviceEventSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(recycleDeviceEventSuperWrapper, RecycleDeviceEventEntity.class, ruleJson, "0"));
             int recycleDeviceEventNum1 = recycleDeviceEventSuperWrapper.getExpression().getNormal().size();
-            if (recycleDeviceEventNum1>0){
-                List<String> recycleDeviceEventList =this.list(recycleDeviceEventSuperWrapper).stream().map(RecycleDeviceEventEntity::getId).collect(Collectors.toList());
+            if (recycleDeviceEventNum1 > 0) {
+                List<String> recycleDeviceEventList = this.list(recycleDeviceEventSuperWrapper).stream().map(RecycleDeviceEventEntity::getId).collect(Collectors.toList());
                 allRuleList.addAll(recycleDeviceEventList);
                 intersectionRuleList.add(recycleDeviceEventList);
                 ruleNum++;
             }
             ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
             //and or
-            if(ruleOp.equalsIgnoreCase("and")){
+            if (ruleOp.equalsIgnoreCase("and")) {
                 allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
-            }else{
+            } else {
                 allRuleIDlist = allRuleList;
             }
         }
-    boolean pcPermission = false;
-    boolean appPermission = false;
-    if(isPc && pcPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleDeviceEventObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceEventQueryWrapper,RecycleDeviceEventEntity.class,recycleDeviceEventPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleDeviceEventObj)){
-        return new ArrayList<>();
-        } else {
-        recycleDeviceEventQueryWrapper = (QueryWrapper<RecycleDeviceEventEntity>)recycleDeviceEventObj;
-        if( recycleDeviceEventQueryWrapper.getExpression().getNormal().size()>0){
-        recycleDeviceEventNum++;
-        }
-        }
-    }
-    }
-    if(!isPc && appPermission){
-    if (!userProvider.get().getIsAdministrator()){
-        Object recycleDeviceEventObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceEventQueryWrapper,RecycleDeviceEventEntity.class,recycleDeviceEventPagination.getMenuId(),"0"));
-        if (ObjectUtil.isEmpty(recycleDeviceEventObj)){
-        return new ArrayList<>();
-        } else {
-        recycleDeviceEventQueryWrapper = (QueryWrapper<RecycleDeviceEventEntity>)recycleDeviceEventObj;
-        if( recycleDeviceEventQueryWrapper.getExpression().getNormal().size()>0){
-        recycleDeviceEventNum++;
-        }
+        boolean pcPermission = false;
+        boolean appPermission = false;
+        if (isPc && pcPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleDeviceEventObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceEventQueryWrapper, RecycleDeviceEventEntity.class, recycleDeviceEventPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleDeviceEventObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleDeviceEventQueryWrapper = (QueryWrapper<RecycleDeviceEventEntity>) recycleDeviceEventObj;
+                    if (recycleDeviceEventQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleDeviceEventNum++;
+                    }
+                }
+            }
         }
+        if (!isPc && appPermission) {
+            if (!userProvider.get().getIsAdministrator()) {
+                Object recycleDeviceEventObj = generaterSwapUtil.getAuthorizeCondition(new QueryModel(recycleDeviceEventQueryWrapper, RecycleDeviceEventEntity.class, recycleDeviceEventPagination.getMenuId(), "0"));
+                if (ObjectUtil.isEmpty(recycleDeviceEventObj)) {
+                    return new ArrayList<>();
+                } else {
+                    recycleDeviceEventQueryWrapper = (QueryWrapper<RecycleDeviceEventEntity>) recycleDeviceEventObj;
+                    if (recycleDeviceEventQueryWrapper.getExpression().getNormal().size() > 0) {
+                        recycleDeviceEventNum++;
+                    }
+                }
 
 
-    }
-    }
-        if(isPc){
-            if(ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getDeviceCode())){
-            recycleDeviceEventNum++;
-
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] deviceCode = JsonUtil.getJsonToBean(recycleDeviceEventPagination.getDeviceCode(),String[][].class);
-        for(int i=0;i<deviceCode.length;i++){
-        if(deviceCode[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> deviceCode = JsonUtil.getJsonToList(recycleDeviceEventPagination.getDeviceCode(),String.class);
-        if(deviceCode.size()>0){
-            idList.addAll(deviceCode);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(recycleDeviceEventPagination.getDeviceCode()));
-        }
+            }
         }
-        recycleDeviceEventQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(RecycleDeviceEventEntity::getDeviceCode, tt).or();
-        });
-        });
+        if (isPc) {
+            if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getDeviceCode())) {
+                recycleDeviceEventNum++;
+
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] deviceCode = JsonUtil.getJsonToBean(recycleDeviceEventPagination.getDeviceCode(), String[][].class);
+                    for (int i = 0; i < deviceCode.length; i++) {
+                        if (deviceCode[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(deviceCode[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> deviceCode = JsonUtil.getJsonToList(recycleDeviceEventPagination.getDeviceCode(), String.class);
+                        if (deviceCode.size() > 0) {
+                            idList.addAll(deviceCode);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(recycleDeviceEventPagination.getDeviceCode()));
+                    }
+                }
+                recycleDeviceEventQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(RecycleDeviceEventEntity::getDeviceCode, tt).or();
+                    });
+                });
 
             }
 
-            if(ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventType())){
-            recycleDeviceEventNum++;
+            if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventType())) {
+                recycleDeviceEventNum++;
 
-        List<String> idList = new ArrayList<>();
-        try {
-        String[][] eventType = JsonUtil.getJsonToBean(recycleDeviceEventPagination.getEventType(),String[][].class);
-        for(int i=0;i<eventType.length;i++){
-        if(eventType[i].length>0){
-        idList.add(JsonUtil.getObjectToString(Arrays.asList(eventType[i])));
-        }
-        }
-        }catch (Exception e1){
-        try {
-        List<String> eventType = JsonUtil.getJsonToList(recycleDeviceEventPagination.getEventType(),String.class);
-        if(eventType.size()>0){
-            idList.addAll(eventType);
-        }
-        }catch (Exception e2){
-        idList.add(String.valueOf(recycleDeviceEventPagination.getEventType()));
-        }
-        }
-        recycleDeviceEventQueryWrapper.lambda().and(t->{
-        idList.forEach(tt->{
-        t.like(RecycleDeviceEventEntity::getEventType, tt).or();
-        });
-        });
+                List<String> idList = new ArrayList<>();
+                try {
+                    String[][] eventType = JsonUtil.getJsonToBean(recycleDeviceEventPagination.getEventType(), String[][].class);
+                    for (int i = 0; i < eventType.length; i++) {
+                        if (eventType[i].length > 0) {
+                            idList.add(JsonUtil.getObjectToString(Arrays.asList(eventType[i])));
+                        }
+                    }
+                } catch (Exception e1) {
+                    try {
+                        List<String> eventType = JsonUtil.getJsonToList(recycleDeviceEventPagination.getEventType(), String.class);
+                        if (eventType.size() > 0) {
+                            idList.addAll(eventType);
+                        }
+                    } catch (Exception e2) {
+                        idList.add(String.valueOf(recycleDeviceEventPagination.getEventType()));
+                    }
+                }
+                recycleDeviceEventQueryWrapper.lambda().and(t -> {
+                    idList.forEach(tt -> {
+                        t.like(RecycleDeviceEventEntity::getEventType, tt).or();
+                    });
+                });
 
             }
 
-            if(ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getIsLocal())){
-            recycleDeviceEventNum++;
+            if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getIsLocal())) {
+                recycleDeviceEventNum++;
 
-        recycleDeviceEventQueryWrapper.lambda().eq(RecycleDeviceEventEntity::getIsLocal,recycleDeviceEventPagination.getIsLocal());
+                recycleDeviceEventQueryWrapper.lambda().eq(RecycleDeviceEventEntity::getIsLocal, recycleDeviceEventPagination.getIsLocal());
 
             }
 
-            if(ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventResult())){
-            recycleDeviceEventNum++;
+            if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventResult())) {
+                recycleDeviceEventNum++;
 
-        recycleDeviceEventQueryWrapper.lambda().eq(RecycleDeviceEventEntity::getEventResult,recycleDeviceEventPagination.getEventResult());
+                recycleDeviceEventQueryWrapper.lambda().eq(RecycleDeviceEventEntity::getEventResult, recycleDeviceEventPagination.getEventResult());
 
             }
 
-            if(ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventTime())){
-            recycleDeviceEventNum++;
+            if (ObjectUtil.isNotEmpty(recycleDeviceEventPagination.getEventTime())) {
+                recycleDeviceEventNum++;
 
-                List EventTimeList =  JsonUtil.getJsonToList(recycleDeviceEventPagination.getEventTime(),String.class);
-                    Long fir = Long.valueOf(String.valueOf(EventTimeList.get(0)));
-                    Long sec = Long.valueOf(String.valueOf(EventTimeList.get(1)));
+                List EventTimeList = JsonUtil.getJsonToList(recycleDeviceEventPagination.getEventTime(), String.class);
+                Long fir = Long.valueOf(String.valueOf(EventTimeList.get(0)));
+                Long sec = Long.valueOf(String.valueOf(EventTimeList.get(1)));
 
-                    recycleDeviceEventQueryWrapper.lambda().ge(RecycleDeviceEventEntity::getEventTime, new Date(fir))
-                    .le(RecycleDeviceEventEntity::getEventTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+                recycleDeviceEventQueryWrapper.lambda().ge(RecycleDeviceEventEntity::getEventTime, new Date(fir))
+                        .le(RecycleDeviceEventEntity::getEventTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
 
 
             }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
-        if (total>0){
-            if (intersection.size()==0){
+        if (total > 0) {
+            if (intersection.size() == 0) {
                 intersection.add("jnpfNullList");
             }
             recycleDeviceEventQueryWrapper.lambda().in(RecycleDeviceEventEntity::getId, intersection);
         }
-    //是否有高级查询
-        if (StringUtil.isNotEmpty(superOp)){
-            if (allSuperIDlist.size()==0){
+        //是否有高级查询
+        if (StringUtil.isNotEmpty(superOp)) {
+            if (allSuperIDlist.size() == 0) {
                 allSuperIDlist.add("jnpfNullList");
             }
             List<String> finalAllSuperIDlist = allSuperIDlist;
-            recycleDeviceEventQueryWrapper.lambda().and(t->t.in(RecycleDeviceEventEntity::getId, finalAllSuperIDlist));
+            recycleDeviceEventQueryWrapper.lambda().and(t -> t.in(RecycleDeviceEventEntity::getId, finalAllSuperIDlist));
         }
-    //是否有数据过滤查询
-        if (StringUtil.isNotEmpty(ruleOp)){
-            if (allRuleIDlist.size()==0){
+        //是否有数据过滤查询
+        if (StringUtil.isNotEmpty(ruleOp)) {
+            if (allRuleIDlist.size() == 0) {
                 allRuleIDlist.add("jnpfNullList");
             }
             List<String> finalAllRuleIDlist = allRuleIDlist;
-            recycleDeviceEventQueryWrapper.lambda().and(t->t.in(RecycleDeviceEventEntity::getId, finalAllRuleIDlist));
+            recycleDeviceEventQueryWrapper.lambda().and(t -> t.in(RecycleDeviceEventEntity::getId, finalAllRuleIDlist));
         }
 
         //排序
-        if(StringUtil.isEmpty(recycleDeviceEventPagination.getSidx())){
+        if (StringUtil.isEmpty(recycleDeviceEventPagination.getSidx())) {
             recycleDeviceEventQueryWrapper.lambda().orderByDesc(RecycleDeviceEventEntity::getId);
-        }else{
+        } else {
             try {
                 String sidx = recycleDeviceEventPagination.getSidx();
-                String[] strs= sidx.split("_name");
+                String[] strs = sidx.split("_name");
                 RecycleDeviceEventEntity recycleDeviceEventEntity = new RecycleDeviceEventEntity();
                 Field declaredField = recycleDeviceEventEntity.getClass().getDeclaredField(strs[0]);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
-                recycleDeviceEventQueryWrapper="asc".equals(recycleDeviceEventPagination.getSort().toLowerCase())?recycleDeviceEventQueryWrapper.orderByAsc(value):recycleDeviceEventQueryWrapper.orderByDesc(value);
+                recycleDeviceEventQueryWrapper = "asc".equals(recycleDeviceEventPagination.getSort().toLowerCase()) ? recycleDeviceEventQueryWrapper.orderByAsc(value) : recycleDeviceEventQueryWrapper.orderByDesc(value);
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
             }
         }
 
-        if("0".equals(dataType)){
-            if((total>0 && AllIdList.size()>0) || total==0){
-                Page<RecycleDeviceEventEntity> page=new Page<>(recycleDeviceEventPagination.getCurrentPage(), recycleDeviceEventPagination.getPageSize());
-                IPage<RecycleDeviceEventEntity> userIPage=this.page(page, recycleDeviceEventQueryWrapper);
-                return recycleDeviceEventPagination.setData(userIPage.getRecords(),userIPage.getTotal());
-            }else{
+        if (!userProvider.get().getIsAdministrator()) {
+            recycleDeviceEventQueryWrapper.lambda().eq(RecycleDeviceEventEntity::getCompanyId, userProvider.get().getOrganizeId());
+        }
+
+        if ("0".equals(dataType)) {
+            if ((total > 0 && AllIdList.size() > 0) || total == 0) {
+                Page<RecycleDeviceEventEntity> page = new Page<>(recycleDeviceEventPagination.getCurrentPage(), recycleDeviceEventPagination.getPageSize());
+                IPage<RecycleDeviceEventEntity> userIPage = this.page(page, recycleDeviceEventQueryWrapper);
+                return recycleDeviceEventPagination.setData(userIPage.getRecords(), userIPage.getTotal());
+            } else {
                 List<RecycleDeviceEventEntity> list = new ArrayList();
                 return recycleDeviceEventPagination.setData(list, list.size());
             }
-        }else{
+        } else {
             return this.list(recycleDeviceEventQueryWrapper);
         }
     }
+
     @Override
-    public RecycleDeviceEventEntity getInfo(String id){
-        QueryWrapper<RecycleDeviceEventEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(RecycleDeviceEventEntity::getId,id);
+    public RecycleDeviceEventEntity getInfo(String id) {
+        QueryWrapper<RecycleDeviceEventEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(RecycleDeviceEventEntity::getId, id);
         return this.getOne(queryWrapper);
     }
+
     @Override
-    public void create(RecycleDeviceEventEntity entity){
+    public void create(RecycleDeviceEventEntity entity) {
         this.save(entity);
     }
+
     @Override
-    public boolean update(String id, RecycleDeviceEventEntity entity){
+    public boolean update(String id, RecycleDeviceEventEntity entity) {
         return this.updateById(entity);
     }
+
     @Override
-    public void delete(RecycleDeviceEventEntity entity){
-        if(entity!=null){
+    public void delete(RecycleDeviceEventEntity entity) {
+        if (entity != null) {
             this.removeById(entity.getId());
         }
     }
-    /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/
+
+    /**
+     * 验证表单唯一字段，正则，非空 i-0新增-1修改
+     */
     @Override
-    public String checkForm(RecycleDeviceEventForm form,int i) {
-        boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
-        String id="";
+    public String checkForm(RecycleDeviceEventForm form, int i) {
+        boolean isUp = StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
+        String id = "";
         String countRecover = "";
-        if (isUp){
+        if (isUp) {
             id = form.getId();
         }
         //主表字段验证
         return countRecover;
     }
+
     /**
-    * 新增修改数据(事务回滚)
-    * @param id
-    * @param recycleDeviceEventForm
-    * @return
-    */
+     * 新增修改数据(事务回滚)
+     *
+     * @param id
+     * @param recycleDeviceEventForm
+     * @return
+     */
     @Override
     @Transactional
-    public void saveOrUpdate(RecycleDeviceEventForm recycleDeviceEventForm,String id, boolean isSave) throws Exception{
-        UserInfo userInfo=userProvider.get();
+    public void saveOrUpdate(RecycleDeviceEventForm recycleDeviceEventForm, String id, boolean isSave) throws Exception {
+        UserInfo userInfo = userProvider.get();
         UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
         recycleDeviceEventForm = JsonUtil.getJsonToBean(
-        generaterSwapUtil.swapDatetime(RecycleDeviceEventConstant.getFormData(),recycleDeviceEventForm),RecycleDeviceEventForm.class);
+                generaterSwapUtil.swapDatetime(RecycleDeviceEventConstant.getFormData(), recycleDeviceEventForm), RecycleDeviceEventForm.class);
         RecycleDeviceEventEntity entity = JsonUtil.getJsonToBean(recycleDeviceEventForm, RecycleDeviceEventEntity.class);
 
-        if(isSave){
-            String mainId =  RandomUtil.uuId() ;
-        entity.setCreateUserId(userInfo.getUserId());
-        entity.setCreateTime(DateUtil.getNowDate());
-        entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setDepartmentId(userEntity.getPositionId());
+        if (isSave) {
+            String mainId = RandomUtil.uuId();
+            entity.setCreateUserId(userInfo.getUserId());
+            entity.setCreateTime(DateUtil.getNowDate());
+            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setDepartmentId(userEntity.getPositionId());
             entity.setId(mainId);
-        }else{
-        entity.setCreateUserId(userInfo.getUserId());
-        entity.setCreateTime(DateUtil.getNowDate());
-        entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(),"all"));
-        entity.setDepartmentId(userEntity.getPositionId());
+        } else {
+            entity.setCreateUserId(userInfo.getUserId());
+            entity.setCreateTime(DateUtil.getNowDate());
+            entity.setOrganizeJsonId(generaterSwapUtil.getCurrentOrgIds(userInfo.getOrganizeId(), "all"));
+            entity.setDepartmentId(userEntity.getPositionId());
         }
         this.saveOrUpdate(entity);