1111

src/main/java/com/jeeplus/modules/sg/project/mapper/xml/ProjectMapper.xml

@@ -49,9 +49,9 @@
 		FROM sg_wbs_project a
 		left join sys_user b on a.create_by = b.id
 		<where>
-		   <if test="createBy != null">
-				a.create_by = #{createBy.id} AND
-		   </if>
+		   <!--<if test="createBy != null">-->
+				<!--a.create_by = #{createBy.id} AND-->
+		   <!--</if>-->
 		    <if test="projectId !=null and projectId != ''">
 				a.id = #{projectId} AND
 			</if>
@@ -67,7 +67,10 @@
 			<if test="projectEndDate != null and projectEndDate != ''">
 				 a.create_date &lt;= #{projectEndDate} AND
 			</if>
-			a.del_flag = '0'
+			<if test="dataScope != null and dataScope != ''">
+			  ${dataScope} and
+			</if>
+			  a.del_flag = '0'
 		</where>
 		 ORDER BY a.update_date DESC
 

src/main/java/com/jeeplus/modules/sg/project/service/ProjectService.java

@@ -97,11 +97,12 @@ public class ProjectService extends CrudService<ProjectMapper, WbsProject> {
 
     //分页查询
     public Page<WbsProject> findPage(Page<WbsProject> page, WbsProject wbsProject) {
+        dataRuleFilter(wbsProject);
         wbsProject.setPage(page);
-        User user = UserUtils.getUser();
-        if(!user.getId().equals("1")){
-            wbsProject.setCreateBy(user);
-        }
+//        User user = UserUtils.getUser();
+//        if(!user.getId().equals("1")){
+//            wbsProject.setCreateBy(user);
+//        }
         List<WbsProject> list =  projectMapper.findList(wbsProject);
         long count = page.getCount();
         Integer pageNo = page.getPageNo();