Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.modules.projectFilingBatch.web;
 
+import com.google.gson.internal.$Gson$Preconditions;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.persistence.Page;
 import com.jeeplus.common.utils.MyBeanUtils;
@@ -17,6 +18,7 @@ import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsServic
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.UserUtils;
+import com.jeeplus.modules.workengineeringproject.entity.WorkEngineeringProject;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.apache.shiro.authz.annotation.Logical;

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectRecordsService.java

@@ -1773,9 +1773,6 @@ public class RuralProjectRecordsService extends CrudService<RuralProjectRecordsD
 		//设置数据权限
 		if(!UserUtils.getUser().isAdmin()) {
 			String dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.WORK_RECORDS.getValue());
-			if(StringUtils.isBlank(dataScopeSql)){
-				dataScopeSql = dataScopeFilterOR(projectRecords.getCurrentUser(), "o", "u", "s", MenuStatusEnum.OVERALL_WORK_RECORDS.getValue());
-			}
 			projectRecords.getSqlMap().put("dsf", dataScopeSql);
 		}
 		projectRecords.setCreateBy(UserUtils.getUser());

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -1382,6 +1382,7 @@
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
+			${sqlMap.dsf}
 		</where>
 	</select>
 	<select id="projectFindList" resultType="com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords">
@@ -1406,18 +1407,20 @@
 			<if test="projectName != null and projectName != ''">
 				AND a.project_name like concat(concat('%',#{projectName}),'%')
 			</if>
+
 			and a.del_flag = 0 and a.project_type in (1,2) and prd.`status`=5
 			and a.id not in (select project_id	FROM project_flingbatch_relation r left join project_filingbatch f on f.filing_batch=r.filing_batch	where f.filing_status in(2,3,5) )
 # 			and a.id not in (select project_id	FROM project_flingbatch_relation where status in(2,3,5) )
-			<choose>
-				<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-# 					ORDER BY ${page.orderBy}
-				</when>
-				<otherwise>
-					ORDER BY a.update_date DESC
-				</otherwise>
-			</choose>
+			${sqlMap.dsf}
 		</where>
+<!--		<choose>-->
+<!--			<when test="page !=null and page.orderBy != null and page.orderBy != ''">-->
+<!--				# 					ORDER BY ${page.orderBy}-->
+<!--			</when>-->
+<!--			<otherwise>-->
+<!--				ORDER BY a.update_date DESC-->
+<!--			</otherwise>-->
+<!--		</choose>-->
 	</select>
 
 	<select id="getReportRecordStatus" resultType="java.lang.String">