system

bladex/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java

@@ -51,129 +51,141 @@ import static org.springblade.core.cache.constant.CacheConstant.DICT_CACHE;
 @Api(value = "业务字典", tags = "业务字典")
 public class DictBizController extends BladeController {
 
-	private final IDictBizService dictService;
-
-	/**
-	 * 详情
-	 */
-	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "详情", notes = "传入dict")
-	public R<DictBizVO> detail(DictBiz dict) {
-		DictBiz detail = dictService.getOne(Condition.getQueryWrapper(dict));
-		return R.data(DictBizWrapper.build().entityVO(detail));
-	}
-
-	/**
-	 * 列表
-	 */
-	@GetMapping("/list")
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string")
-	})
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "列表", notes = "传入dict")
-	public R<List<DictBizVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
-		List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort));
-		return R.data(DictBizWrapper.build().listNodeVO(list));
-	}
-
-	/**
-	 * 顶级列表
-	 */
-	@GetMapping("/parent-list")
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string")
-	})
-	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "列表", notes = "传入dict")
-	public R<IPage<DictBizVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> dict, Query query) {
-		return R.data(dictService.parentList(dict, query));
-	}
-
-	/**
-	 * 子列表
-	 */
-	@GetMapping("/child-list")
-	@ApiImplicitParams({
-		@ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string"),
-		@ApiImplicitParam(name = "parentId", value = "字典名称", paramType = "query", dataType = "string")
-	})
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "列表", notes = "传入dict")
-	public R<List<DictBizVO>> childList(@ApiIgnore @RequestParam Map<String, Object> dict, @RequestParam(required = false, defaultValue = "-1") Long parentId) {
-		return R.data(dictService.childList(dict, parentId));
-	}
-
-	/**
-	 * 获取字典树形结构
-	 */
-	@GetMapping("/tree")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "树形结构", notes = "树形结构")
-	public R<List<DictBizVO>> tree() {
-		List<DictBizVO> tree = dictService.tree();
-		return R.data(tree);
-	}
-
-	/**
-	 * 获取字典树形结构
-	 */
-	@GetMapping("/parent-tree")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "树形结构", notes = "树形结构")
-	public R<List<DictBizVO>> parentTree() {
-		List<DictBizVO> tree = dictService.parentTree();
-		return R.data(tree);
-	}
-
-	/**
-	 * 新增或修改
-	 */
-	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@ApiOperation(value = "新增或修改", notes = "传入dict")
-	public R submit(@Valid @RequestBody DictBiz dict) {
-		CacheUtil.clear(DICT_CACHE);
-		return R.status(dictService.submit(dict));
-	}
-
-
-	/**
-	 * 删除
-	 */
-	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
-	@ApiOperation(value = "删除", notes = "传入ids")
-	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		CacheUtil.clear(DICT_CACHE);
-		return R.status(dictService.removeDict(ids));
-	}
-
-	/**
-	 * 获取字典
-	 */
-	@GetMapping("/dictionary")
-	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "获取字典", notes = "获取字典")
-	public R<List<DictBiz>> dictionary(String code) {
-		List<DictBiz> tree = dictService.getList(code);
-		return R.data(tree);
-	}
-
-	/**
-	 * 获取字典树
-	 */
-	@GetMapping("/dictionary-tree")
-	@ApiOperationSupport(order = 9)
-	@ApiOperation(value = "获取字典树", notes = "获取字典树")
-	public R<List<DictBizVO>> dictionaryTree(String code) {
-		List<DictBiz> tree = dictService.getList(code);
-		return R.data(DictBizWrapper.build().listNodeVO(tree));
-	}
+    private final IDictBizService dictService;
+
+    /**
+     * 详情
+     */
+    @GetMapping("/detail")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "详情", notes = "传入dict")
+    public R<DictBizVO> detail(DictBiz dict) {
+        DictBiz detail = dictService.getOne(Condition.getQueryWrapper(dict));
+        return R.data(DictBizWrapper.build().entityVO(detail));
+    }
+
+    /**
+     * 列表
+     */
+    @GetMapping("/list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string")
+    })
+    @ApiOperationSupport(order = 2)
+    @ApiOperation(value = "列表", notes = "传入dict")
+    public R<List<DictBizVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
+        List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort));
+        return R.data(DictBizWrapper.build().listNodeVO(list));
+    }
+
+    /**
+     * 顶级列表
+     */
+    @GetMapping("/parent-list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string")
+    })
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "列表", notes = "传入dict")
+    public R<IPage<DictBizVO>> parentList(@ApiIgnore @RequestParam Map<String, Object> dict, Query query) {
+        return R.data(dictService.parentList(dict, query));
+    }
+
+    /**
+     * 子列表
+     */
+    @GetMapping("/child-list")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "code", value = "字典编号", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "dictValue", value = "字典名称", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "parentId", value = "字典名称", paramType = "query", dataType = "string")
+    })
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "列表", notes = "传入dict")
+    public R<List<DictBizVO>> childList(@ApiIgnore @RequestParam Map<String, Object> dict, @RequestParam(required = false, defaultValue = "-1") Long parentId) {
+        return R.data(dictService.childList(dict, parentId));
+    }
+
+    /**
+     * 获取字典树形结构
+     */
+    @GetMapping("/tree")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "树形结构", notes = "树形结构")
+    public R<List<DictBizVO>> tree() {
+        List<DictBizVO> tree = dictService.tree();
+        return R.data(tree);
+    }
+
+    /**
+     * 获取字典树形结构
+     */
+    @GetMapping("/treeByTenantId")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "树形结构", notes = "树形结构")
+    public R<List<DictBizVO>> treeByTenantId() {
+        List<DictBizVO> tree = dictService.treeByTenantId();
+        return R.data(tree);
+    }
+
+
+    /**
+     * 获取字典树形结构
+     */
+    @GetMapping("/parent-tree")
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "树形结构", notes = "树形结构")
+    public R<List<DictBizVO>> parentTree() {
+        List<DictBizVO> tree = dictService.parentTree();
+        return R.data(tree);
+    }
+
+    /**
+     * 新增或修改
+     */
+    @PostMapping("/submit")
+    @ApiOperationSupport(order = 6)
+    @ApiOperation(value = "新增或修改", notes = "传入dict")
+    public R submit(@Valid @RequestBody DictBiz dict) {
+        CacheUtil.clear(DICT_CACHE);
+        return R.status(dictService.submit(dict));
+    }
+
+
+    /**
+     * 删除
+     */
+    @PostMapping("/remove")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "删除", notes = "传入ids")
+    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        CacheUtil.clear(DICT_CACHE);
+        return R.status(dictService.removeDict(ids));
+    }
+
+    /**
+     * 获取字典
+     */
+    @GetMapping("/dictionary")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "获取字典", notes = "获取字典")
+    public R<List<DictBiz>> dictionary(String code) {
+        List<DictBiz> tree = dictService.getList(code);
+        return R.data(tree);
+    }
+
+    /**
+     * 获取字典树
+     */
+    @GetMapping("/dictionary-tree")
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "获取字典树", notes = "获取字典树")
+    public R<List<DictBizVO>> dictionaryTree(String code) {
+        List<DictBiz> tree = dictService.getList(code);
+        return R.data(DictBizWrapper.build().listNodeVO(tree));
+    }
 
 
 }

bladex/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.java

@@ -61,4 +61,6 @@ public interface DictBizMapper extends BaseMapper<DictBiz> {
 	 */
 	List<DictBizVO> parentTree();
 
+	List<DictBizVO>  treeByTenantId(String tenantId);
+
 }

bladex/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml

@@ -24,9 +24,11 @@
     </resultMap>
 
     <select id="getValue" resultType="java.lang.String">
-        select
-            dict_value
-        from blade_dict_biz where code = #{param1} and dict_key = #{param2} and is_deleted = 0
+        select dict_value
+        from blade_dict_biz
+        where code = #{param1}
+          and dict_key = #{param2}
+          and is_deleted = 0
     </select>
 
     <!-- oracle 版本 -->
@@ -37,15 +39,46 @@
     </select>-->
 
     <select id="getList" resultMap="dictResultMap">
-        select id, tenant_id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0
+        select id,
+               tenant_id,
+               parent_id,
+               code,
+               dict_key,
+               dict_value,
+               sort,
+               remark
+        from blade_dict_biz
+        where code = #{param1}
+          and parent_id > 0
+          and is_sealed = 0
+          and is_deleted = 0
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">
-        select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict_biz where is_deleted = 0
+        select id, parent_id, dict_value as title, id as "value", id as "key"
+        from blade_dict_biz
+        where is_deleted = 0
     </select>
 
     <select id="parentTree" resultMap="treeNodeResultMap">
-        select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict_biz where is_deleted = 0 and parent_id = 0
+        select id, parent_id, dict_value as title, id as "value", id as "key"
+        from blade_dict_biz
+        where is_deleted = 0
+          and parent_id = 0
+    </select>
+
+    <select id="treeByTenantId" resultType="org.springblade.system.vo.DictBizVO">
+        select id,
+               parent_id,
+               dict_value as title,
+               id         as "value",
+               id         as "key",
+               code,
+               dict_key,
+               dict_value
+        from blade_dict_biz
+        where is_deleted = 0
+          and tenant_id = #{tenantId}
     </select>
 
 </mapper>

bladex/blade-service/blade-system/src/main/java/org/springblade/system/service/IDictBizService.java

@@ -98,4 +98,6 @@ public interface IDictBizService extends IService<DictBiz> {
 	 */
 	List<DictBizVO> childList(Map<String, Object> dict, Long parentId);
 
+	List<DictBizVO> treeByTenantId();
+
 }

bladex/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DictBizServiceImpl.java

@@ -25,6 +25,7 @@ import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.Func;
@@ -116,4 +117,10 @@ public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> impl
 		List<DictBiz> list = this.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().ne(DictBiz::getId, parentId).eq(DictBiz::getCode, parentDict.getCode()).orderByAsc(DictBiz::getSort));
 		return DictBizWrapper.build().listNodeVO(list);
 	}
+
+	@Override
+	public List<DictBizVO> treeByTenantId() {
+		String tenantId = AuthUtil.getTenantId();
+		return ForestNodeMerger.merge(baseMapper.treeByTenantId(tenantId));
+	}
 }