From d562b35ec9d09979971066ba9c07ec8576f9a45e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 八月 2024 16:38:22 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java | 2 +-
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 2 +-
pms-parent/pms-global/src/main/resources/init-config.xml | 2 +-
pms-parent/pms-web-station/pom.xml | 6 ------
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/init-config.xml b/pms-parent/pms-global/src/main/resources/init-config.xml
index 2b04555..b759f38 100644
--- a/pms-parent/pms-global/src/main/resources/init-config.xml
+++ b/pms-parent/pms-global/src/main/resources/init-config.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
- <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="admin" supperAdmin="1" />
+ <user name="瓒呯骇绠＄悊鍛�" phone="admin" password="ABC123" supperAdmin="1" />
</config>
\ No newline at end of file
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 4926dde..9ebda5d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -76,7 +76,7 @@
select
count(*)
from ba_user
- where supper_admin!=1 and deleted!=1
+ where deleted!=1
</select>
<select id="login" resultMap="loginResultMap" >
select
diff --git a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java
index 9fdd527..3cb8c22 100644
--- a/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java
+++ b/pms-parent/pms-web-base/src/main/java/com/dy/pmsBase/util/PrivilegeListener.java
@@ -80,7 +80,7 @@
String num = ele.getAttributeValue("num") ;
String name = ele.getAttributeValue("name") ;
String type = ele.getAttributeValue("type") ;
- String typeName = ele.getAttributeValue("type_name") ;
+ String typeName = ele.getAttributeValue("typeName") ;
this.savePrivilege(num, name, type,typeName);
}
}
diff --git a/pms-parent/pms-web-station/pom.xml b/pms-parent/pms-web-station/pom.xml
index 3677720..f96d205 100644
--- a/pms-parent/pms-web-station/pom.xml
+++ b/pms-parent/pms-web-station/pom.xml
@@ -211,12 +211,6 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
- <dependency>
- <groupId>com.dy</groupId>
- <artifactId>pms-web-product</artifactId>
- <version>1.0.0</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
--
Gitblit v1.8.0