标签内容修改

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

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -379,7 +380,7 @@ public class SysDictController {
 	@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
-	//@RequiresPermissions("dict:add")
+	@RequiresPermissions("dict:add")
 	public Result<SysDict> add(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
 		try {
@@ -420,7 +421,7 @@ public class SysDictController {
 	@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
 	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
-	//@RequiresPermissions("dict:edit")
+	@RequiresPermissions("dict:edit")
 	public Result<SysDict> edit(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
 		SysDict sysdict = sysDictService.getById(sysDict.getId());
@@ -481,7 +482,7 @@ public class SysDictController {
 	@RequiresRoles({"admin"})
 	@GetMapping(value = "/logicDelete")
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
-	//@RequiresPermissions("dict:logicDelete")
+	@RequiresPermissions("dict:logicDelete")
 	public Result<SysDict> logicDelete(@RequestParam(name="id",required=true) String id) {
 
 		Result<SysDict> result = new Result<SysDict>();

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

@@ -152,7 +152,7 @@ public class SysDictItemController {
 	 * @return
 	 */
 	//@RequiresRoles({"admin"})
-	//@RequiresPermissions("dict:logicDelete")
+	@RequiresPermissions("dictItem:logicDelete")
 	@RequestMapping(value = "/logicDelete", method = RequestMethod.GET)
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDictItem> logicDelete(@RequestParam(name="id",required=true) String id) {
@@ -210,7 +210,7 @@ public class SysDictItemController {
 	 * @return
 	 */
 	//@RequiresRoles({"admin"})
-	//@RequiresPermissions("dict:logicDeleteBatch")
+	@RequiresPermissions("dictItem:logicDeleteBatch")
 	@RequestMapping(value = "/logicDeleteBatch", method = RequestMethod.GET)
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDictItem> logicDeleteBatch(@RequestParam(name="ids",required=true) String ids) {

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

@@ -21,7 +21,7 @@
 		select create_by,create_time,sys_org_code,update_by,update_time,attribute_type,code,
 		del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
 		from sys_category
-		where is_tag_dict=1 and sys_dict_id=#{params.sys_dict_id}
+		where is_tag_dict=1 and sys_dict_id=#{params.sysDictId}
 
 		<!--搜索条件:标签名称包含%,单独搜索-->
 		<if test="params.name != null and params.name != ''">

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

@@ -65,6 +65,7 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 		//update-end--Author:baihailong  Date:20191209 for：分类字典编码规则生成器做成公用配置
 		sysCategory.setCode(categoryCode);
 		sysCategory.setPid(categoryPid);
+		sysCategory.setIsTagDict(1);
 		sysCategory.setDelFlag(CommonConstant.DEL_FLAG_0);
 		baseMapper.insert(sysCategory);
 	}