From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
index e2cfd14..87d89c9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/LcCompareCodeServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.helper.AESUtil;
+import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_grid.dao.LcCompareCodeMapper;
import com.panzhihua.service_grid.dao.LcCompareMemberCodeMapper;
import com.panzhihua.service_grid.model.dos.LcCompareCodeDO;
@@ -24,13 +24,13 @@
@Service
public class LcCompareCodeServiceImpl extends ServiceImpl<LcCompareCodeMapper, LcCompareCodeDO> implements LcCompareCodeService {
- @Resource
- private LcCompareMemberCodeMapper compareMemberCodeMapper;
+ @Resource
+ private LcCompareMemberCodeMapper compareMemberCodeMapper;
@Override
public String getLcGridIdByLocal(Long id) {
try {
- return baseMapper.selectOne(
+ return baseMapper.selectOne(
new QueryWrapper<LcCompareCodeDO>()
.eq("local_grid_id", id)
).getLcGridId();
@@ -52,4 +52,13 @@
}
return null;
}
+
+ /**
+ * 综治后台-查询所有市平台网格列表
+ * @return 市平台网格列表
+ */
+ @Override
+ public R getLcGridLists(){
+ return R.ok(this.baseMapper.getLcGridLists());
+ }
}
--
Gitblit v1.7.1