WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
xiejunyu
2022-03-14 22:11:24 +08:00
parent 79e6c2d9ec
commit 70b4eac868
4 changed files with 74 additions and 45 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/controller/SysDictController.java
+3 -3
View File
@@ -477,7 +477,7 @@ public class SysDictController {
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) {
result.error500("固定字段,不可删除");
} else {
sysDict.setDelFlag(CommonConstant.DEL_FLAG_1);
sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,id);
result.success("删除成功!");
}
}catch (Exception e) {
@@ -504,7 +504,7 @@ public class SysDictController {
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) {
result.error500("包含固定字段,不可删除");
} else {
sysDict.setDelFlag(CommonConstant.DEL_FLAG_1);
sysDictService.removeByIds(Arrays.asList(ids.split(",")));
result.success("删除成功!");
}
}
@@ -532,7 +532,7 @@ public class SysDictController {
if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(joinSystem.getIsReadOnly())) {
result.error500("包含固定字段,不可删除");
} else {
joinSystem.setDelFlag(CommonConstant.DEL_FLAG_1);
sysDictService.updateDictDelFlag(CommonConstant.DEL_FLAG_1,joinSystem.getId());
result.success("批量删除成功!");
}
}
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+18 -18
View File
@@ -41,11 +41,13 @@ import java.util.stream.Collectors;
@Slf4j
public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
@Autowired
private SysDictMapper sysDictMapper;
@Autowired
private SysDictItemMapper sysDictItemMapper;
@Resource
@Autowired
private SysDictMapper sysDictMapper;
@Autowired
private SysDictItemMapper sysDictItemMapper;
@Resource
private RedisTemplate<String, Object> redisTemplate;
/**
@@ -191,24 +193,22 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
return texts;
}
/**
* 查询选项内容--数据字典名称
* @return
*/
@Override
public List<SysDict> queryDictName(String cut,SysDict sysDict) {
QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
/**
* 查询选项内容--数据字典名称
* @return
*/
@Override
public List<SysDict> queryDictName(String cut,SysDict sysDict) {
QueryWrapper<SysDict> queryWrapper = new QueryWrapper<>();
queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type","dict_code").eq("is_tag_dict", 1);
if (CutEnum.CN.getValue().equals(cut)) {
queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
return list(queryWrapper);
}else{
queryWrapper.select("id", "dict_name","dict_en_name", "attribute_type").eq("is_tag_dict", 1);
List<SysDict> resetlist = list(queryWrapper);
resetlist.stream().forEach(f->f.setDictName(f.getDictEnName()));
return resetlist;
}
}
}
/**
* 根据字典类型id删除关联表中其对应的数据
@@ -382,7 +382,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
Integer count = sysDictMapper.selectCount(queryWrapper);
return count;
}
//TODO 代码加注释
//标签新增表单-查询选项内容
@Override
public Integer queryExitDictName(SysDict sysDict) {
LambdaQueryWrapper<SysDict> queryWrapper = new LambdaQueryWrapper<>();
@@ -412,5 +413,4 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
return result;
}
}