takai-admin/src/main/java/com/takai/web/controller/takaiai/TakaiAiController.java

@@ -97,6 +97,7 @@ public class TakaiAiController extends BaseController {
     public TableDataInfo getApplicationList(@RequestBody TakaiPageParams params) {
         TakaiApplication vo = setFlagParams(params.getUserId(), params.getTypeId(), params.getProjectId(), 1);
         PageHelper.startPage(params.getPageNumber(), params.getPageSize(), "").setReasonable(true);
+        vo.setName(params.getName());
         List<TakaiApplicationResult> list = takaiAisService.getApplicationList(vo);
         Page<TakaiApplicationResult> page = (Page<TakaiApplicationResult>) list;
         return getDataTableResultTotal(list, page.getTotal());

takai-ai/src/main/java/com/takai/ai/domain/entity/TakaiPageParams.java

@@ -16,6 +16,16 @@ public class TakaiPageParams {
 
     private String projectId;
 
+    private String name;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public Integer getPageNumber() {
         return pageNumber;
     }

takai-ai/src/main/resources/mapper/takaiai/TakaiApplicationMapper.xml

@@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				<if test="projectId != null and projectId != ''">
 					AND sp.project_id = #{projectId}
 				</if>
+				<if test="name != null and name != ''">
+					AND (bm.name like concat('%',#{name},'%') or bm.description like concat('%',#{name},'%'))
+				</if>
 			</where>
 			ORDER BY sort IS NULL, sort ASC, bm.update_time DESC, bm.create_time DESC
 		</if>
@@ -155,6 +158,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="projectId != null and projectId != ''">
 			AND sp.project_id = #{projectId}
 		</if>
+		<if test="name != null and name != ''">
+			AND (bm.name like concat('%',#{name},'%') or bm.description like concat('%',#{name},'%'))
+		</if>
 		<if test="projectId == null or projectId == ''">
 			<!-- 用户所属项目下以外的应用 -->
 			UNION
@@ -194,6 +200,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="typeId != null and typeId != ''">
 				AND ba.type_id = #{typeId}
 			</if>
+			<if test="name != null and name != ''">
+				AND (ba.name like concat('%',#{name},'%') or ba.description like concat('%',#{name},'%'))
+			</if>
 			<!-- 待审核的应用 -->
 			UNION
 			SELECT DISTINCT
@@ -239,6 +248,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="typeId != null and typeId != ''">
 				AND bl.type_id = #{typeId}
 			</if>
+			<if test="name != null and name != ''">
+				AND (bl.name like concat('%',#{name},'%') or bl.description like concat('%',#{name},'%'))
+			</if>
 		</if>
 		<!-- 私有应用 -->
 		UNION
@@ -267,6 +279,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    and ba.create_by= #{params.userId}
 		<if test="typeId != null and typeId != ''">
 			AND ba.type_id = #{typeId}
+		</if>
+		<if test="name != null and name != ''">
+			AND (ba.name like concat('%',#{name},'%') or ba.description like concat('%',#{name},'%'))
 		</if>
 			<!-- 部门项目应用 -->
 			UNION
@@ -310,6 +325,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="typeId != null and typeId != ''">
 				AND ba.type_id = #{typeId}
 			</if>
+			<if test="name != null and name != ''">
+				AND (ba.name like concat('%',#{name},'%') or ba.description like concat('%',#{name},'%'))
+			</if>
 			<!-- 数据范围过滤 -->
 			${params.dataScope}
 			<if test="addOrderBy == null or addOrderBy == 'Y'">

takai-system/src/main/java/com/takai/system/domain/SysProjectStaff.java

@@ -71,6 +71,8 @@ public class SysProjectStaff extends BaseEntity
 
     private String userId;
 
+    private String deptId;
+
 
     @Override
     public String toString() {

takai-system/src/main/resources/mapper/system/SysProjectStaffMapper.xml

@@ -54,11 +54,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join sys_role as sr on ur.role_id = sr.role_id
         <where>
             <if test="projectPid != null  and projectPid != ''"> and sps.project_pid = #{projectPid}</if>
-            <!--<if test="userId != null  and userId != ''"> and sps.user_id = #{userId}</if>-->
+            <if test="userId != null  and userId != ''"> and sps.user_id = #{userId}</if>
             <if test="roleId != null  and roleId != ''"> and sps.role_id = #{roleId}</if>
             <if test="mBdate != null "> and sps.m_bdate <![CDATA[ >= ]]> #{mBdate}</if>
             <if test="mEdate != null "> and sps.m_edate <![CDATA[ <= ]]> #{mEdate}</if>
             <if test="sourceFrom != null  and sourceFrom != ''"> and sp.source_from = #{sourceFrom}</if>
+            <if test="deptId != null  and deptId != ''"> and su.dept_id = #{deptId}</if>
+            <if test="userType != null  and userType != ''"> and su.user_type = #{userType}</if>
         </where>
     </select>