优化

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/mapper/xml/EnterpriseElectricityMapper.xml

@@ -27,6 +27,27 @@
 		a.del_flag AS "delFlag"
     </sql>
 
+	<sql id="enterpriseElectricityColumns2">
+		a.id AS "id",
+		a.qy_id AS "qyId",
+		a.stime AS "sTime",
+		a.etime AS "eTime",
+		a.amount AS "amount",
+		a.degrees AS "degrees",
+		a.is_pay AS "isPay",
+		a.des1 AS "des1",
+		a.des2 AS "des2",
+		a.des3 AS "des3",
+		a.des8 AS "des8",
+
+
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate",
+		a.del_flag AS "delFlag"
+	</sql>
+
     <sql id="enterpriseElectricityJoins">
 
         LEFT JOIN sys_user qyId ON qyId.id = a.qy_id
@@ -34,7 +55,7 @@
 
     <select id="findList" resultType="com.jeeplus.enterpriseelectricity.service.dto.EnterpriseElectricityDTO">
         SELECT
-        <include refid="enterpriseElectricityColumns"/>
+        <include refid="enterpriseElectricityColumns2"/>
         FROM ly_enterprise_electricity a
 
 

jp-console/jeeplus-web/src/main/java/com/jeeplus/config/WebConfig.java

@@ -100,6 +100,7 @@ public class WebConfig implements WebMvcConfigurer {
     public ServletRegistrationBean druidServletRegistration() {
         ServletRegistrationBean registration = new ServletRegistrationBean ( new StatViewServlet ( ) );
         registration.addUrlMappings ( "/druid/*" );
+        registration.setEnabled(false);//不显示监控页面
         return registration;
     }
 

jp-mobile/pages/index/index.vue

@@ -266,6 +266,7 @@
 	import DoublePicker from '@/components/DoublePicker/DoublePicker.vue'
 	import MescrollMixin from "@/components/mescroll-uni/mescroll-mixins.js";
 	import MescrollMoreItemMixin from "@/components/mescroll-uni/mixins/mescroll-more-item.js";
+	import * as $auth from "../../common/auth"
 	import {mapActions} from 'vuex'
 	export default {
 		mixins: [MescrollMixin, MescrollMoreItemMixin], // 使用mixin (在main.js注册全局组件)
@@ -535,14 +536,29 @@
 			},
 			
 			totongxunlu22(){
-				uni.navigateTo({
-					url: '/pages/buildList/buildList3?w=1'
-				})
+				if(this.isLogin==null){
+					
+				}else{
+					let roleIds= $auth.getUserInfo().roleIds;
+					if(roleIds=='1910175386924417025'||roleIds=='17bac1f980264e3e8193bc965538e2c6'||roleIds=='ade960e8f02544998b07397304c059c1'){
+						uni.navigateTo({
+							url: '/pages/buildList/buildList3?w=1'
+						})
+					}
+				}
 			},
 			totongxunlu23(){
-				uni.navigateTo({
-					url: '/pages/buildList/buildList3?w=2'
-				})
+				if(this.isLogin==null){
+					
+				}else{
+					let roleIds= $auth.getUserInfo().roleIds;
+					if(roleIds=='1910175386924417025'||roleIds=='17bac1f980264e3e8193bc965538e2c6'||roleIds=='ade960e8f02544998b07397304c059c1'){
+						uni.navigateTo({
+							url: '/pages/buildList/buildList3?w=2'
+						})
+					}
+					
+				}
 			},
 			
 			getPageInfo() {