Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 igds-core/src/main/java/com/ld/igds/view/service/DeviceService.java

@@ -1,30 +1,27 @@
package com.ld.igds.view.service;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.apache.commons.lang.StringUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.common.CoreDeviceService;
import com.ld.igds.models.Device;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * 
 * @author Andy
 *
 */
@Component
public class DeviceService extends HibernateDao {
   
   
   @Autowired
    @Resource
   private CoreDeviceService coreDeviceService;

   /**
@@ -35,7 +32,6 @@
    * <p>
    * Description:
    * </p>
    *
    */
   public List<Device> loadDevice(Map<String, Object> parameter) {
      if (parameter == null || parameter.size() <= 0)