Commit 8bd6e1bd authored by luben's avatar luben

fix

parent 5b8c2cfa
...@@ -214,6 +214,9 @@ public class LabelsFacadeService { ...@@ -214,6 +214,9 @@ public class LabelsFacadeService {
List<Map<String, Object>> res = new ArrayList<>(); List<Map<String, Object>> res = new ArrayList<>();
for (Map<String, Object> map : jsTreeModels) { for (Map<String, Object> map : jsTreeModels) {
String scope = (String) map.get("scope"); String scope = (String) map.get("scope");
if(scope == null){
continue;
}
if(scope.contains(bsCommonVO.getScope())){ if(scope.contains(bsCommonVO.getScope())){
res.add(map); res.add(map);
} }
......
...@@ -167,6 +167,9 @@ ...@@ -167,6 +167,9 @@
<if test="ylzd5 != null"> <if test="ylzd5 != null">
ylzd5, ylzd5,
</if> </if>
<if test="scope != null">
scope,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -205,6 +208,9 @@ ...@@ -205,6 +208,9 @@
<if test="ylzd5 != null"> <if test="ylzd5 != null">
#{ylzd5,jdbcType=VARCHAR}, #{ylzd5,jdbcType=VARCHAR},
</if> </if>
<if test="scope != null">
#{scope,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.ruoyi.system.domain.other.BsCommonExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.ruoyi.system.domain.other.BsCommonExample" resultType="java.lang.Long">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment