KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix-bug-202303' into fix-bug-202303

Browse Source
This commit is contained in:
zhaoxiao
2023-03-07 11:33:32 +08:00
parent 31f8d714ae bce404f0c3
commit 669dce736c
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+11 -9
View File
@@ -82,9 +82,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public Map<String, List<DictModel>> queryAllDictItems() { public Map<String, List<DictModel>> queryAllDictItems() {
Map<String, List<DictModel>> res = new HashMap<String, List<DictModel>>(); Map<String, List<DictModel>> res = new HashMap<>();
List<SysDict> ls = sysDictMapper.selectList(null); List<SysDict> ls = sysDictMapper.selectList(null);
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictItem::getStatus, 1); queryWrapper.eq(SysDictItem::getStatus, 1);
queryWrapper.orderByAsc(SysDictItem::getSortOrder); queryWrapper.orderByAsc(SysDictItem::getSortOrder);
List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper); List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper);
@@ -200,7 +200,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
// 查询出来的顺序可能是乱的，需要排个序 // 查询出来的顺序可能是乱的，需要排个序
for (String key : keyArray) { for (String key : keyArray) {
List<DictModel> res = dicts.stream().filter(i -> key.equals(i.getValue())).collect(Collectors.toList()); List<DictModel> res = dicts.stream().filter(i -> key.equals(i.getValue())).collect(Collectors.toList());
if (res.size() > 0) { if (!res.isEmpty()) {
texts.add(res.get(0).getText()); texts.add(res.get(0).getText());
} else if (!delNotExist) { } else if (!delNotExist) {
texts.add(key); texts.add(key);
@@ -256,7 +256,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) { public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) {
Page<DictModel> page = new Page<DictModel>(1, pageSize); Page<DictModel> page = new Page<>(1, pageSize);
page.setSearchCount(false); page.setSearchCount(false);
String filterSql = getFilterSql(text, code, condition, keyword); String filterSql = getFilterSql(text, code, condition, keyword);
IPage<DictModel> pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql); IPage<DictModel> pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql);
@@ -272,11 +272,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
* @return * @return
*/ */
private String getFilterSql(String text, String code, String condition, String keyword){ private String getFilterSql(String text, String code, String condition, String keyword){
String keywordSql = null, filterSql = "", sql_where = " where "; String keywordSql = null;
String filterSql = "";
String sql_where = " where ";
if(oConvertUtils.isNotEmpty(keyword)){ if(oConvertUtils.isNotEmpty(keyword)){
// 判断是否是多选 // 判断是否是多选
if (keyword.contains(",")) { if (keyword.contains(",")) {
String inKeywords = "\"" + keyword.replaceAll(",", "\",\"") + "\""; String inKeywords = "\"" + keyword.replace(",", "\",\"") + "\"";
keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))"; keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))";
} else { } else {
keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')"; keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')";
@@ -295,8 +297,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public List<DictModel> queryAllTableDictItems(String table, String text, String code, String condition, String keyword) { public List<DictModel> queryAllTableDictItems(String table, String text, String code, String condition, String keyword) {
String filterSql = getFilterSql(text, code, condition, keyword); String filterSql = getFilterSql(text, code, condition, keyword);
List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql); // List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql);
return ls; return baseMapper.queryAllTableDictItems(table, text, code, filterSql);
} }
@Override @Override
@@ -331,7 +333,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
copyTreeSelectModel = newTreeSelectModel; copyTreeSelectModel = newTreeSelectModel;
} }
} }
System.out.println("aaa"); log.info("aaa");
// 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点 // 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点
List<TreeSelectModel> treeNodeList = new ArrayList<>(); List<TreeSelectModel> treeNodeList = new ArrayList<>();
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysGatewayRouteServiceImpl.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class SysGatewayRouteServiceImpl extends ServiceImpl<SysGatewayRouteMappe
@Override @Override
public void addRoute2Redis(String key) { public void addRoute2Redis(String key) {
List<SysGatewayRoute> ls = this.list(new LambdaQueryWrapper<SysGatewayRoute>()); List<SysGatewayRoute> ls = this.list(new LambdaQueryWrapper<>());
redisTemplate.opsForValue().set(key, JSON.toJSONString(ls)); redisTemplate.opsForValue().set(key, JSON.toJSONString(ls));
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysLogServiceImpl.java
+5 -8
View File
@@ -1,13 +1,7 @@
package com.jero.modules.system.service.impl; package com.jero.modules.system.service.impl;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.util.CommonUtils; import com.jero.common.util.CommonUtils;
import com.jero.modules.system.entity.SysLog; import com.jero.modules.system.entity.SysLog;
@@ -16,7 +10,10 @@ import com.jero.modules.system.service.ISysLogService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java
+6 -6
View File
@@ -41,11 +41,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
*/ */
@Override @Override
public List<SysPermissionDataRule> getPermRuleListByPermId(String permissionId) { public List<SysPermissionDataRule> getPermRuleListByPermId(String permissionId) {
LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<SysPermissionDataRule>(); LambdaQueryWrapper<SysPermissionDataRule> query = new LambdaQueryWrapper<>();
query.eq(SysPermissionDataRule::getPermissionId, permissionId); query.eq(SysPermissionDataRule::getPermissionId, permissionId);
query.orderByDesc(SysPermissionDataRule::getCreateTime); query.orderByDesc(SysPermissionDataRule::getCreateTime);
List<SysPermissionDataRule> permRuleList = this.list(query); // List<SysPermissionDataRule> permRuleList = this.list(query);
return permRuleList; return this.list(query);
} }
/** /**
@@ -61,11 +61,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
public List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId) { public List<SysPermissionDataRule> queryPermissionDataRules(String username,String permissionId) {
List<String> idsList = this.baseMapper.queryDataRuleIds(username, permissionId); List<String> idsList = this.baseMapper.queryDataRuleIds(username, permissionId);
//update-begin--Author:scott Date:20191119 for：数据权限失效问题处理-------------------- //update-begin--Author:scott Date:20191119 for：数据权限失效问题处理--------------------
if(idsList==null || idsList.size()==0) { if(idsList==null || idsList.isEmpty()) {
return null; return null;
} }
//update-end--Author:scott Date:20191119 for：数据权限失效问题处理-------------------- //update-end--Author:scott Date:20191119 for：数据权限失效问题处理--------------------
Set<String> set = new HashSet<String>(); Set<String> set = new HashSet<>();
for (String ids : idsList) { for (String ids : idsList) {
if(oConvertUtils.isEmpty(ids)) { if(oConvertUtils.isEmpty(ids)) {
continue; continue;
@@ -77,7 +77,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl<SysPermissionDataRule
} }
} }
} }
if(set.size()==0) { if(set.isEmpty()) {
return null; return null;
} }
return this.baseMapper.selectList(new QueryWrapper<SysPermissionDataRule>().in("id", set).eq("status",CommonConstant.STATUS_1)); return this.baseMapper.selectList(new QueryWrapper<SysPermissionDataRule>().in("id", set).eq("status",CommonConstant.STATUS_1));