Commit d436f381 authored by chenzhao's avatar chenzhao

权限修改 拦截器语句优化

parent 4298df9c
...@@ -149,7 +149,8 @@ public class UserEmpowerInterceptor implements Interceptor { ...@@ -149,7 +149,8 @@ public class UserEmpowerInterceptor implements Interceptor {
if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())) { if (!ValidationUtil.isEmpty(dataAuthRule.getAdminRegionalCompaniesCode())) {
sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list); sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
} else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) { } else if (!ValidationUtil.isEmpty(dataAuthRule.getUserId())) {
sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(2)}, fileCondition, list); list.remove(1);
sq = selectSqlJXS(new String[]{fileds.get(0),fileds.size()<3?fileds.get(0):fileds.get(2)},new String[]{fileCondition[0],fileCondition[2]} , list);
} else { } else {
sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list); sq = selectSqlJXS(new String[]{fileds.get(0), fileds.get(1)}, fileCondition, list);
} }
...@@ -339,7 +340,7 @@ public class UserEmpowerInterceptor implements Interceptor { ...@@ -339,7 +340,7 @@ public class UserEmpowerInterceptor implements Interceptor {
if(data.size()==1){ if(data.size()==1){
sql = sql+getData(filed,data); sql = sql+getData(filed,data);
}else{ }else{
sql = sql+getData(filed,data);
} }
break; break;
} }
...@@ -373,11 +374,11 @@ public class UserEmpowerInterceptor implements Interceptor { ...@@ -373,11 +374,11 @@ public class UserEmpowerInterceptor implements Interceptor {
String sql=""; String sql="";
if(data.size()==1){ if(data.size()==1){
sql= sql+filed+" = "+data.get(0); sql= sql+filed+" = '"+data.get(0)+"'";
}else{ }else{
for (int i = 0; i < data.size(); i++) { for (int i = 0; i < data.size(); i++) {
if(i==data.size()-1){ if(i==data.size()-1){
sql= sql+filed+" = "+data.get(i)+" "; sql= sql+filed+" = '"+data.get(i)+"' ";
}else{ }else{
sql= sql+filed+" = "+data.get(i)+" and ";; sql= sql+filed+" = "+data.get(i)+" and ";;
} }
...@@ -471,7 +472,7 @@ public class UserEmpowerInterceptor implements Interceptor { ...@@ -471,7 +472,7 @@ public class UserEmpowerInterceptor implements Interceptor {
for (int i = 0; i < filed.length; i++) { for (int i = 0; i < filed.length; i++) {
String sq = " "; String sq = " ";
sq = getCondition(filed[i], fileCondition[i], data); sq = getCondition(filed[i], fileCondition[i], Arrays.asList(data.get(i)));
sql.add(sq); sql.add(sq);
} }
} }
......
...@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param; ...@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
*/ */
public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> { public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"dealer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField={"dealer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto); IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto);
} }
...@@ -25,37 +25,37 @@ public interface JpStationMapper extends BaseMapper<JpStation> { ...@@ -25,37 +25,37 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
List<Map<String,Object>> countState(@Param("dto") JpStationDto reviewDto); List<Map<String,Object>> countState(@Param("dto") JpStationDto reviewDto);
List<Map<String,Double>> getPowerqx(String dateType); List<Map<String,Double>> getPowerqx(String dateType);
//@DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and") //@DealerRestrict(field ={"amos_company_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","in"} ,relationship="and")
@UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<JpStation> getJpStation(@Param("dto") JpStationDto reviewDto); List<JpStation> getJpStation(@Param("dto") JpStationDto reviewDto);
List<JpStation> getJpStationList(@Param("dto") JpStationDto reviewDto); List<JpStation> getJpStationList(@Param("dto") JpStationDto reviewDto);
@UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"in","in","in"} ,relationship="and",specific=false) @UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"eq","in","in"} ,relationship="and",specific=false)
List<DropDown> getRegion(); List<DropDown> getRegion();
@UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<DropDown> getDealer(@Param("regionalCompaniesCode") String regionalCompaniesCode); List<DropDown> getDealer(@Param("regionalCompaniesCode") String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
JpStationDto getCountJpStationdata(@Param("dto") JpStationDto reviewDto); JpStationDto getCountJpStationdata(@Param("dto") JpStationDto reviewDto);
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<Map<String,Object>> getcountState(@Param("dto") JpStationDto reviewDto); List<Map<String,Object>> getcountState(@Param("dto") JpStationDto reviewDto);
//投产电站数 //投产电站数
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Map<String,Object>getcountStatetc(@Param("dto") JpStationDto reviewDto); Map<String,Object>getcountStatetc(@Param("dto") JpStationDto reviewDto);
//建设建站数 //建设建站数
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Map<String,Object>getcountStatejs(@Param("dto") JpStationDto reviewDto); Map<String,Object>getcountStatejs(@Param("dto") JpStationDto reviewDto);
//接入中电站数 //接入中电站数
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Map<String,Object>getcountStatejr(@Param("dto") JpStationDto reviewDto); Map<String,Object>getcountStatejr(@Param("dto") JpStationDto reviewDto);
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
Map<String,Object> getcount( @Param("dto") JpStationDto reviewDto); Map<String,Object> getcount( @Param("dto") JpStationDto reviewDto);
@UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"in","in"} ,relationship="and") @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa); List<JpStationDto> queryForDealerReviewPagenew(@Param("dto") JpStationDto reviewDto, Page<JpStationDto> pa);
List<DropDown> getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq); List<DropDown> getDealerNew(@Param("regionalCompaniesSeq") String regionalCompaniesSeq);
......
...@@ -29,7 +29,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> { ...@@ -29,7 +29,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
@Param("ids")String ids @Param("ids")String ids
); );
@UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and") @UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
Page<PeasantHouseholdDto> queryForPage(Page<PeasantHouseholdDto> page, String developerCode,String ownersName,Long developerId,Integer isCertified); Page<PeasantHouseholdDto> queryForPage(Page<PeasantHouseholdDto> page, String developerCode,String ownersName,Long developerId,Integer isCertified);
} }
...@@ -22,7 +22,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> { ...@@ -22,7 +22,7 @@ public interface PreparationMoneyMapper extends BaseMapper<PreparationMoney> {
List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName); List<PeasantHousehold> getPeasantHouseholdData(@Param("sequenceNbr") Long sequenceNbr,@Param("ownersName") String ownersName);
@UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"in","in","in"} ,relationship="and") @UserEmpower(field ={"regional_companies_code"} ,dealerField={"amos_unit_org_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
IPage<PreparationMoney> selectPage(IPage<PreparationMoney> page, @Param(Constants.WRAPPER) Wrapper<PreparationMoney> queryWrapper); IPage<PreparationMoney> selectPage(IPage<PreparationMoney> page, @Param(Constants.WRAPPER) Wrapper<PreparationMoney> queryWrapper);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment