Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/feign/StatusClient.java

@@ -8,8 +8,10 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.RestController;
@@ -44,7 +46,12 @@
      if (conditionMap == null) {
         conditionMap = new HashMap<>(16);
      }
      return R.data(service.listStatus(conditionMap,baseQueryObject.getPageHelper()));
      Map<String,Object> condition = new HashMap<>();
      BeanUtil.copy(conditionMap,condition);
      Query query = new Query();
      query.setCurrent(baseQueryObject.getPage());
      query.setSize(baseQueryObject.getLimit());
      return R.data(service.listStatus(condition,query));
   }

   /**