Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hp-smart
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
platform
hp-smart
Commits
e75b2039
Commit
e75b2039
authored
Feb 20, 2024
by
宋祥
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.fixBug:系统管理页面报错问题修复
parent
e6de3e00
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
26 deletions
+7
-26
CKExcelTools.java
...main/java/com/baosight/hpjx/hp/kc/tools/CKExcelTools.java
+0
-4
HPSC002A.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml
+3
-18
HPSC005B.xml
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml
+1
-1
HPSC002B.jsp
src/main/webapp/HP/SC/HPSC002B.jsp
+1
-1
XSOG0801.jsp
src/main/webapp/XS/OG/XSOG0801.jsp
+1
-1
XS3001.jsp
src/main/webapp/XS/XS3001.jsp
+1
-1
No files found.
src/main/java/com/baosight/hpjx/hp/kc/tools/CKExcelTools.java
View file @
e75b2039
package
com
.
baosight
.
hpjx
.
hp
.
kc
.
tools
;
package
com
.
baosight
.
hpjx
.
hp
.
kc
.
tools
;
import
com.baosight.hpjx.hp.kc.domain.HPKC004
;
import
com.baosight.hpjx.hp.kc.domain.HPKC004
;
import
com.baosight.hpjx.hp.pz.tools.HPPZTools
;
import
com.baosight.hpjx.util.DateUtils
;
import
com.baosight.hpjx.util.DateUtils
;
import
com.baosight.hpjx.util.ExcelUtils
;
import
com.baosight.hpjx.util.ExcelUtils
;
import
com.baosight.hpjx.util.MapUtils
;
import
com.baosight.hpjx.util.MapUtils
;
...
@@ -21,9 +20,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
...
@@ -21,9 +20,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.jsp.PageContext
;
import
javax.servlet.jsp.PageContext
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml
View file @
e75b2039
...
@@ -37,23 +37,8 @@
...
@@ -37,23 +37,8 @@
<isNotEmpty
prepend=
" AND "
property=
"docId"
>
<isNotEmpty
prepend=
" AND "
property=
"docId"
>
A.DOC_ID = #docId#
A.DOC_ID = #docId#
</isNotEmpty>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"createdBy"
>
<isNotEmpty
prepend=
" AND "
property=
"docName"
>
A.CREATED_BY = #createdBy#
B.DOC_NAME LIKE CONCAT('%', #docName#, '%')
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"createdName"
>
A.CREATED_NAME = #createdName#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"createdTime"
>
A.CREATED_TIME = #createdTime#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"updatedBy"
>
A.UPDATED_BY = #updatedBy#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"updatedName"
>
A.UPDATED_NAME = #updatedName#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"updatedTime"
>
A.UPDATED_TIME = #updatedTime#
</isNotEmpty>
</isNotEmpty>
</sql>
</sql>
...
@@ -69,7 +54,7 @@
...
@@ -69,7 +54,7 @@
<sql
id=
"order"
>
<sql
id=
"order"
>
<dynamic
prepend=
"ORDER BY"
>
<dynamic
prepend=
"ORDER BY"
>
<isNotEmpty
property=
"order"
>
<isNotEmpty
property=
"order"
>
$order
By
$
$order$
</isNotEmpty>
</isNotEmpty>
<isEmpty
property=
"order"
>
<isEmpty
property=
"order"
>
A.ID DESC
A.ID DESC
...
...
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml
View file @
e75b2039
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
<sql
id=
"order"
>
<sql
id=
"order"
>
<dynamic
prepend=
"ORDER BY"
>
<dynamic
prepend=
"ORDER BY"
>
<isNotEmpty
property=
"order"
>
<isNotEmpty
property=
"order"
>
$order
By
$
$order$
</isNotEmpty>
</isNotEmpty>
<isEmpty
property=
"order"
>
<isEmpty
property=
"order"
>
ID ASC
ID ASC
...
...
src/main/webapp/HP/SC/HPSC002B.jsp
View file @
e75b2039
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<div
class=
"row"
>
<div
class=
"row"
>
<EF:EFInput
cname=
"项目名称"
ename=
"projName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
readonly=
"true"
/>
<EF:EFInput
cname=
"项目名称"
ename=
"projName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
readonly=
"true"
/>
<EF:EFInput
cname=
"部件名称"
ename=
"prdtName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
readonly=
"true"
/>
<EF:EFInput
cname=
"部件名称"
ename=
"prdtName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
readonly=
"true"
/>
<EF:EFInput
cname=
"文件名称"
ename=
"docName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
readonly=
"true"
/>
<EF:EFInput
cname=
"文件名称"
ename=
"docName"
blockId=
"inqu_status"
row=
"0"
colWidth=
"3"
/>
<EF:EFDateSpan
startCname=
"创建日期(从)"
endCname=
"至"
blockId=
"inqu_status"
<EF:EFDateSpan
startCname=
"创建日期(从)"
endCname=
"至"
blockId=
"inqu_status"
startName=
"createdDateFrom"
endName=
"createdDateTo"
row=
"0"
role=
"date"
startName=
"createdDateFrom"
endName=
"createdDateTo"
row=
"0"
role=
"date"
format=
"yyyy-MM-dd"
ratio=
"3:3"
satrtRatio=
"4:8"
endRatio=
"4:8"
readonly=
"true"
>
format=
"yyyy-MM-dd"
ratio=
"3:3"
satrtRatio=
"4:8"
endRatio=
"4:8"
readonly=
"true"
>
...
...
src/main/webapp/XS/OG/XSOG0801.jsp
View file @
e75b2039
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
String loginPublicKey = LoginConstants.loginRsaPublicKey;
String loginPublicKey = LoginConstants.loginRsaPublicKey;
String cryptoPasswordEnable = LoginConstants.cryptoPasswordEnable;
String cryptoPasswordEnable = LoginConstants.cryptoPasswordEnable;
String companyCode = UserSessionUtils.getCompanyCode();
String companyCode = UserSessionUtils.getCompanyCode();
String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.
getPz009
(companyCode).getLoginPrefix();
String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.
HpPz009.getByCode
(companyCode).getLoginPrefix();
%>
%>
<c:set var="pwdRgx" value="<%=passwordRegex%>"/>
<c:set var="pwdRgx" value="<%=passwordRegex%>"/>
<c:set var="pwdDesc" value="<%=passwordDesc%>"/>
<c:set var="pwdDesc" value="<%=passwordDesc%>"/>
...
...
src/main/webapp/XS/XS3001.jsp
View file @
e75b2039
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
request.setAttribute("passwordTip", "密码由不超过255位的英文字母或者数字字符或下划线组成。");
request.setAttribute("passwordTip", "密码由不超过255位的英文字母或者数字字符或下划线组成。");
}
}
String companyCode = UserSessionUtils.getCompanyCode();
String companyCode = UserSessionUtils.getCompanyCode();
String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.
getPz009
(companyCode).getLoginPrefix();
String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.
HpPz009.getByCode
(companyCode).getLoginPrefix();
String username = UserSession.getUser().getUsername();
String username = UserSession.getUser().getUsername();
String passwordRegex = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.regex"), "^(?=.*?[a-zA-Z])(?=.*?[0-9]).{1,}$");
String passwordRegex = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.regex"), "^(?=.*?[a-zA-Z])(?=.*?[0-9]).{1,}$");
String passwordDesc = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.desc"), "密码必须包含英文及数字");
String passwordDesc = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.desc"), "密码必须包含英文及数字");
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment