标签增加批量删除功能

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java

@@ -101,6 +101,7 @@ public class SysCategoryController {
 	@AutoLog(value = "标签内容-树形结构-通过sysDictId查询")
 	@ApiOperation(value="标签内容-树形结构-通过sysDictId查询", notes="标签内容-树形结构-通过sysDictId查询")
 	@GetMapping(value = "/queryBySysDictId")
+	//	@RequiresPermissions("sys:category:queryBySysDictId")
 	public Result<?> queryBySysDictId(@RequestParam(name="id",required=true) String sysDictId) {
 		List<SysCategory> sysCategory = sysCategoryService.queryBySysDictId(sysDictId);
 		if(sysCategory==null) {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -365,6 +365,7 @@ public class SysDictController {
 	@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	//@RequiresPermissions("dict:add")
 	public Result<SysDict> add(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
 		try {
@@ -405,6 +406,7 @@ public class SysDictController {
 	@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
+	//@RequiresPermissions("dict:edit")
 	public Result<SysDict> edit(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
 		SysDict sysdict = sysDictService.getById(sysDict.getId());
@@ -465,6 +467,7 @@ public class SysDictController {
 	@RequiresRoles({"admin"})
 	@DeleteMapping(value = "/logicDelete")
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
+	//@RequiresPermissions("dict:logicDelete")
 	public Result<SysDict> logicDelete(@RequestParam(name="id",required=true) String id) {
 
 		Result<SysDict> result = new Result<SysDict>();
@@ -498,9 +501,9 @@ public class SysDictController {
 		}else {
 			if (StringUtils.isNotBlank(String.valueOf(sysDict.getIsReadOnly()))) {
 				if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(sysDict.getIsReadOnly())) {
-					result.error500("固定字段,不可删除");
+					result.error500("包含固定字段,不可删除");
 				} else {
-					sysDictService.removeByIds(Arrays.asList(ids.split(",")));
+					sysDict.setDelFlag(CommonConstant.DEL_FLAG_1);
 					result.success("删除成功!");
 				}
 			}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDictMapper.java

@@ -161,6 +161,5 @@ public interface SysDictMapper extends BaseMapper<SysDict> {
 			"from sys_dict as d\n" +
 			"left join sys_dict_item as i on d.attribute_type=i.item_value\n" +
 			"where i.dict_id=\"1494570247913512962\"")
-	//IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
 	IPage<SysDict> queryPageList(IPage page,@Param("params") Map<String,Object> params);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java

@@ -160,8 +160,6 @@ public interface ISysDictService extends IService<SysDict> {
 	 */
 	Integer queryExitData(SysDict sysDict);
 
-	//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper);
-
 	Integer queryExitDictName(SysDict sysDict);
 
 	IPage<SysDict> queryPageList(Map<String, Object> params);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java

@@ -392,13 +392,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		return count;
 	}
 
-	/*@Override
-	public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<SysDict> queryWrapper) {
-		IPage<Map<String, Object>> info= sysDictMapper.selectPageInfo(page, queryWrapper);
-		List<Map<String, Object>> list = info.getRecords().stream().collect(Collectors.toList());
-		return list;
-	}*/
-
 	/**
 	 * 标签内容-分页查询
 	 *