diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java
index ab696506..58193caf 100644
--- a/src/main/java/geoinfo/main/login/LoginController.java
+++ b/src/main/java/geoinfo/main/login/LoginController.java
@@ -1165,11 +1165,11 @@ public class LoginController {
msg = "";
mv = new ModelAndView("home/liq_chk");
}
- if ("Y".equals(admPwdChg)) {
+ if ("Y".equals(admPwdChg) && (cls.equals("0") || cls.equals("1")) ) {
msg = "";
url = "topMenuSelect.do?url=mypage_passch";
}
- if ("".equals(di)) {
+ if ("".equals(di) && (cls.equals("0") || cls.equals("1")) ) {
msg = "";
url = "topMenuSelect.do?url=mypage_passch";
}
diff --git a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldWaterpressure.jsp b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldWaterpressure.jsp
index ff083752..b6430971 100644
--- a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldWaterpressure.jsp
+++ b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldWaterpressure.jsp
@@ -45,7 +45,6 @@ function selectGrid1(){
let item = grid1Data[i];
if(item != null){
let fieldwpAvgPermeailityPr = item.fieldwpAvgPermeability.toFixed(10);
-
while(fieldwpAvgPermeailityPr.endsWith('0')){
fieldwpAvgPermeailityPr = fieldwpAvgPermeailityPr.slice(0, -1);
}