Merge remote-tracking branch 'origin/dev_v3.2.3' into dev_v3.2.3

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicRoleDataPermissionServiceImpl.java

@@ -62,9 +62,12 @@ public class BasicRoleDataPermissionServiceImpl extends ServiceImpl<BasicRoleDat
             if (count > 0) {
                 throw ExceptionResultEnum.ERROR.exception("角色数据权限要绑在菜单级权限上");
             }
-            this.remove(new QueryWrapper<BasicRoleDataPermission>().lambda()
-                    .eq(BasicRoleDataPermission::getSchoolId, schoolId)
-                    .eq(BasicRoleDataPermission::getRoleId, roleId));
+            QueryWrapper<BasicRoleDataPermission> basicRoleDataPermissionQueryWrapper = new QueryWrapper<BasicRoleDataPermission>();
+            if (Objects.nonNull(schoolId)) {
+                basicRoleDataPermissionQueryWrapper.lambda().eq(BasicRoleDataPermission::getSchoolId, schoolId);
+            }
+            basicRoleDataPermissionQueryWrapper.lambda().eq(BasicRoleDataPermission::getRoleId, roleId);
+            this.remove(basicRoleDataPermissionQueryWrapper);
 
             List<BasicRoleDataPermission> basicRoleDataPermissionList = dataPermissionInfoList.stream()
                     .filter(e -> Objects.nonNull(e.getDataPermissionType()))

teachcloud-common/src/main/resources/mapper/SysRoleMapper.xml

@@ -63,6 +63,12 @@
         union
         <include refid="Base_Column_List" />
         where t.default_role = 1 and (t.type = 'SCHOOL_ADMIN' or t.type = 'SCHOOL_TEACHER' or t.type = 'ASSISTANT')
+            <if test="name != null and name != ''">
+                and t.name like concat('%', #{name}, '%')
+            </if>
+            <if test="enable != null and enable != '' or enable == 0">
+                and t.enable = #{enable}
+            </if>
             ) t
         ORDER BY t.create_time
     </select>