Merge branch 'master' into energy-manage-chy2

energy-manage-service/src/main/java/com/energy/manage/service/util/IPUtils.java

@@ -71,7 +71,7 @@ public class IPUtils {
         if (!StringUtils.isEmpty(ip) && ip.indexOf(IP_UTILS_FLAG) > 0) {
             ip = ip.substring(0, ip.indexOf(IP_UTILS_FLAG));
         }
-
+        logger.info("getIpAddr method end, ip: {}", ip);
         return ip;
     }
 

energy-manage-service/src/main/resources/mybatis/windfield/WindFieldMapper.xml

@@ -46,8 +46,6 @@
         </if>
         <if test="item.fieldName!=null or item.beginTime != null or item.endTime!=null">
             and
-            wf.create_by = #{item.userId}
-            and
             wf.field_code in (select code_number from sys_organization_auth where role_id =#{item.roleId} and code_type = 'field')
         </if>
         <if test="item.fieldName == null and item.beginTime == null and item.beginTime == null">

energy-manage-service/src/main/resources/mybatis/windrelation/WindRelationMapper.xml

@@ -58,8 +58,6 @@
         <if test="state!=null or companyName!=null">
             and
             wc.company_code in (select code_number from sys_organization_auth where role_id =#{roleId} and code_type = 'company')
-            and
-            wc.create_by = #{userId}
         </if>
         <if test="state==null and companyName==null">
             and