数据权限调整

cjy-project/src/main/java/com/cjy/investordata/controller/InvestorDataController.java

@@ -64,7 +64,6 @@ public class InvestorDataController extends BaseController
     /**
      * 获取项目投资商数据 详细信息
      */
-    @PreAuthorize("@ss.hasPermi('investorData:investorData:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

cjy-project/src/main/resources/mapper/enterprise/ApplyMapper.xml

@@ -81,7 +81,7 @@
             right join sys_role_menu t2 on t1.menu_id = t2.menu_id
             right join ti_apply t3 on t3.menu_id =  t1.menu_id
         where t2.role_id in (select role_id from sys_user_role where user_id =#{userId})
-          and t3.del_flag !='2' and t1.status ='0'
+          and t3.del_flag !='2' and t1.status ='0' and t3.status ='0'
           and t3.apply_group_id =#{applyGroupId}
           and t3.organ_code =#{organCode}
         order by t3.sort asc

cjy-project/src/main/resources/mapper/enterprise/EnterpriseResourcesAgreementMapper.xml

@@ -48,7 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEnterpriseResourcesAgreementById" parameterType="Long" resultMap="EnterpriseResourcesAgreementResult">
-        <include refid="selectEnterpriseResourcesAgreementVo"/>
+        select id, enterprise_resource_type_id, resource_agreement_id, remark, sort,ifnull(param_value,'') from ti_enterprise_resources_agreement
+
         where id = #{id}
     </select>
     <select id="selectCountEnterpriseResourcesAgreementByResourceAgreementId" resultType="java.lang.Integer">

cjy-project/src/main/resources/mapper/enterprise/MechanismParameterMapper.xml

@@ -45,7 +45,13 @@
     </select>
 
     <select id="selectMechanismParameterById" parameterType="Long" resultMap="MechanismParameterResult">
-        <include refid="selectMechanismParameterVo"/>
+        select id,
+               argument_name,
+               argument_code,
+               argument_value,
+               remark,
+               sort
+        from ti_mechanism_parameter
         where id = #{id}
     </select>
 

cjy-project/src/main/resources/mapper/enterprise/SchedulingMapper.xml

@@ -40,13 +40,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rest != null  and isRest != ''"> and is_rest = #{rest}</if>
             <if test="restStartTime != null "> and rest_start_time = #{restStartTime}</if>
             <if test="restEndTime != null "> and rest_end_time = #{restEndTime}</if>
-             and del_flag !='2'
+             and del_flag !='2' and organ_code = #{organCode}
         </where>
         order by sort asc
     </select>
     
     <select id="selectSchedulingById" parameterType="Long" resultMap="SchedulingResult">
-        <include refid="selectSchedulingVo"/>
+        select id, name, sort, scheduling_type, marking, work_start_time, work_end_time, is_rest, rest_start_time, rest_end_time, remark from ti_scheduling
+
         where id = #{id}
     </select>
         

cjy-project/src/main/resources/mapper/estate/MeteorologicalMonitoringMapper.xml

@@ -132,7 +132,38 @@
     </select>
 
     <select id="selectMeteorologicalMonitoringById" parameterType="Long" resultMap="MeteorologicalMonitoringResult">
-        <include refid="selectMeteorologicalMonitoringVo"/>
+        select id,
+
+               statistical_time,
+               province_code,
+               city_code,
+               county_code,
+               weather,
+               maximum_temperature,
+               minimum_temperature,
+               humidity,
+               airPressure,
+               comfort,
+               air_pollution_index,
+               wind_power,
+               wind_direction,
+               inhalable_particles,
+               fine_particles,
+               sulfur_dioxide,
+               nitrogen_dioxide,
+               carbonic_oxide,
+               ozone,
+               data_source,
+               remark,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               air_quality,
+               sensible_temperature,
+               status
+        from ps_meteorological_monitoring
         where id = #{id}
     </select>
 

cjy-project/src/main/resources/mapper/estate/TourismProjectMapper.xml

@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectTourismProjectById" parameterType="Long" resultMap="TourismProjectResult">
-        <include refid="selectTourismProjectVo"/>
+        select id,  project_name, build_properties, project_status, project_organ, province_code, city_code, county_code, address, signing_time, signing_money, contract_way, is_landing, investors_id, fewer_funds, planned_commencement_date, actual_commencement_date, completion_date, project_progress, progress_description, difficult_illustrate, project_summary, social_Investor, government_Investment, government_social_cooperation, accommodation, block, park, collection, outdoors, interpretation, other, isverify, del_flag, data_sources, remark, create_by, create_time, update_by, update_time from ps_tourism_project
         where id = #{id}
     </select>
         

cjy-project/src/main/resources/mapper/estate/TouristSourceMapper.xml

@@ -99,7 +99,7 @@
             <if test="dataSources != null  and dataSources != ''">and t1.data_sources = #{dataSources}</if>
             <if test="provinceSource != null  and provinceSource != ''">and t1.province_source = #{provinceSource}</if>
             <if test="citySource != null  and citySource != ''">and t1.city_source = #{citySource}</if>
-            and t1.del_flag !='2' and t2.del_flag !='2'
+            and t1.del_flag !='2' and t2.del_flag !='2' and t1.organ_code =#{organCode}
         </where>
         order by t1.statistical_time desc
     </select>

cjy-project/src/main/resources/mapper/estate/TravelClubRouteTouristMapper.xml

@@ -111,7 +111,25 @@
     </select>
 
     <select id="selectTravelClubRouteTouristById" parameterType="Long" resultMap="TravelClubRouteTouristResult">
-        <include refid="selectTravelClubRouteTouristVo"/>
+        select id,
+
+               travel_club_route_id,
+               tourist_name,
+               sex,
+               age,
+               province_code,
+               city_code,
+               county_code,
+               phone,
+               certificate,
+               remark,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               del_flag,
+               data_sources
+        from ps_travel_club_route_tourist
         where id = #{id}
     </select>
     <select id="selectTravelClubRouteTouristNumGroupByTime"  resultMap="TravelClubRouteTouristMap">