Merge branch 'dev' into 'main'

Dev

See merge request !39

ruoyi-system/src/main/java/com/ruoyi/system/service/other/LabelsFacadeService.java

@@ -214,6 +214,9 @@ public class LabelsFacadeService {
         List<Map<String, Object>> res = new ArrayList<>();
         for (Map<String, Object> map : jsTreeModels) {
             String scope = (String) map.get("scope");
+            if(scope == null){
+                continue;
+            }
             if(scope.contains(bsCommonVO.getScope())){
                 res.add(map);
             }

ruoyi-system/src/main/resources/mapper/other/LabelsMapper.xml

@@ -167,6 +167,9 @@
       <if test="ylzd5 != null">
         ylzd5,
       </if>
+      <if test="scope != null">
+        scope,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -205,6 +208,9 @@
       <if test="ylzd5 != null">
         #{ylzd5,jdbcType=VARCHAR},
       </if>
+      <if test="scope != null">
+        #{scope,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ruoyi.system.domain.other.BsCommonExample" resultType="java.lang.Long">