Merge remote-tracking branch 'origin/feature/workfolwDept'

# Conflicts:
#	src/main/java/com/zsc/edu/dify/framework/security/CustomAccessDeniedHandler.java
#	src/main/java/com/zsc/edu/dify/modules/dify/entity/WorkflowDept.java
#	src/main/java/com/zsc/edu/dify/modules/dify/service/AppEntityService.java
#	src/test/java/com/zsc/edu/dify/modules/dify/repo/AppEntityRepositoryTest.java

src/main/java/com/zsc/edu/dify/framework/security/JpaUserDetailsServiceImpl.java

@@ -55,3 +55,4 @@ public class JpaUserDetailsServiceImpl implements UserDetailsService {
         return UserDetailsImpl.from(user, permissions);
     }
 }
+

src/main/java/com/zsc/edu/dify/framework/security/UserDetailsImpl.java

@@ -130,3 +130,5 @@ public class UserDetailsImpl implements UserDetails {
                 '}';
     }
 }
+
+

src/main/java/com/zsc/edu/dify/modules/dify/entity/AppEntity.java

@@ -69,4 +69,9 @@ public class AppEntity extends AppsResponseVO {
             return this.value;
         }
     }
+
+    public AppEntity(String id, Long deptId) {
+        this.setId(id);
+        this.deptId = deptId;
+    }
 }

src/main/resources/mappers/dify/AppEntityMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zsc.edu.dify.modules.dify.repo.AppEntityRepository">
+
+
+    <select id="selectByAppType" resultType="appEntity">
+        select ae.* from apps_entity ae
+        left join workflow_dept wd on wd.workflow_id = ae.id
+        <where>
+            <if test="deptId != null">
+                and wd.dept_id = #{deptId}
+            </if>
+            <if test="appType != null">
+                and ae.app_type = #{appType}
+            </if>
+        </where>
+    </select>
+
+</mapper>