瀏覽代碼

fix联锁基础表-普通列表只展示一二级

LLL 1 年之前
父節點
當前提交
be6af358a8

+ 5 - 1
jeecg-module-interlock/src/main/java/org/jeecg/modules/base/controller/InterlockBaseController.java

@@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -60,7 +62,9 @@ public class InterlockBaseController extends JeecgController<InterlockBase, IInt
 	 @ApiOperation("联锁基础表-普通列表")
 	 @GetMapping(value = "/list")
 	 public List<InterlockBase> list(){
-	 	return interlockBaseService.list();
+	 	LambdaQueryWrapper<InterlockBase> wrapper = new LambdaQueryWrapper<>();
+	 	wrapper.eq(InterlockBase::getInterlockType,"0").or().eq(InterlockBase::getInterlockType,"1");
+	 	return interlockBaseService.list(wrapper);
 	 }
 
 	/**查一二级树形结构*/