6 年之前 · de5242b221
--- a/Api/src/main/java/com/java110/api/listener/fee/SaveParkingSpaceCreateFeeListener.java
+++ b/Api/src/main/java/com/java110/api/listener/fee/SaveParkingSpaceCreateFeeListener.java
@@ -106,7 +106,7 @@ public class SaveParkingSpaceCreateFeeListener extends AbstractServiceApiListene
 
																         }
															
 
																         if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) {
															
 
																-            throw new IllegalArgumentException("未查到需要付费的房屋");
															
 
																+            throw new IllegalArgumentException("未查到需要付费的车位");
															
 
																         }
															
 
																         dealParkingSpaceFee(parkingSpaceDtos, context, reqJson, event);
															
--- a/Api/src/main/java/com/java110/api/listener/user/ChangeStaffPwdListener.java
+++ b/Api/src/main/java/com/java110/api/listener/user/ChangeStaffPwdListener.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 
																 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
															
 
																 import com.java110.core.annotation.Java110Listener;
															
 
																 import com.java110.core.context.DataFlowContext;
															
 
																+import com.java110.core.factory.AuthenticationFactory;
															
 
																 import com.java110.core.smo.user.IUserInnerServiceSMO;
															
 
																 import com.java110.dto.user.UserDto;
															
 
																 import com.java110.entity.center.AppService;
															
@@ -69,6 +70,9 @@ public class ChangeStaffPwdListener extends AbstractServiceApiDataFlowListener {
 
																         Assert.jsonObjectHaveKey(paramInJson, "oldPwd", "请求参数中未包含oldPwd 节点，请确认");
															
 
																         Assert.jsonObjectHaveKey(paramInJson, "newPwd", "请求参数中未包含newPwd 节点，请确认");
															
 
																+        paramInJson.put("oldPwd", AuthenticationFactory.passwdMd5(paramInJson.getString("oldPwd")));
															
 
																+        paramInJson.put("newPwd", AuthenticationFactory.passwdMd5(paramInJson.getString("newPwd")));
															
 
																+
															
 
																         JSONArray businesses = new JSONArray();
															
 
																         //判断请求报文中包含 userId 并且 不为-1时 将已有用户添加为员工，反之，则添加用户再将用户添加为员工
															
 
																         JSONObject staffBusiness = modifyStaff(paramInJson, dataFlowContext);
															
--- a/WebService/src/main/java/com/java110/web/smo/staff/impl/ChangeStaffPwdSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/staff/impl/ChangeStaffPwdSMOImpl.java
@@ -34,7 +34,7 @@ public class ChangeStaffPwdSMOImpl extends AbstractComponentSMO implements IChan
 
																     @Override
															
 
																     protected void validate(IPageData pd, JSONObject paramIn) {
															
 
																-        Assert.hasKeyAndValue(paramIn, "communityId", "必填，请填写小区信息");
															
 
																+        //Assert.hasKeyAndValue(paramIn, "communityId", "必填，请填写小区信息");
															
 
																         Assert.hasKeyAndValue(paramIn, "oldPwd", "必填，请填写原始密码");
															
 
																         Assert.hasKeyAndValue(paramIn, "newPwd", "必填，请填写新密码");
															
@@ -48,8 +48,8 @@ public class ChangeStaffPwdSMOImpl extends AbstractComponentSMO implements IChan
 
																         Map paramMap = BeanConvertUtil.beanCovertMap(result);
															
 
																         paramIn.putAll(paramMap);
															
 
																-        paramIn.put("oldPwd", AuthenticationFactory.passwdMd5(paramIn.getString("oldPwd")));
															
 
																-        paramIn.put("newPwd", AuthenticationFactory.passwdMd5(paramIn.getString("newPwd")));
															
 
																+//        paramIn.put("oldPwd", AuthenticationFactory.passwdMd5(paramIn.getString("oldPwd")));
															
 
																+//        paramIn.put("newPwd", AuthenticationFactory.passwdMd5(paramIn.getString("newPwd")));
															
 
																         String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/user.changeStaffPwd";
															
--- a/WebService/src/main/resources/components/staffPackage/changeStaffPwd/changeStaffPwd.js
+++ b/WebService/src/main/resources/components/staffPackage/changeStaffPwd/changeStaffPwd.js
@@ -6,7 +6,6 @@
 
																     vc.extends({
															
 
																         data: {
															
 
																             changeStaffPwdInfo: {
															
 
																-                communityId: vc.getCurrentCommunity().communityId,
															
 
																                 oldPwd: '',
															
 
																                 newPwd: '',
															
 
																                 reNewPwd:''
															
@@ -45,13 +44,6 @@
 
																                             param: "",
															
 
																                             errInfo: "确认密码不能为空"
															
 
																                         }
															
 
																-                    ],
															
 
																-                    'changeStaffPwdInfo.communityId': [
															
 
																-                        {
															
 
																-                            limit: "required",
															
 
																-                            param: "",
															
 
																-                            errInfo: "还未入驻小区，请先入驻小区"
															
 
																-                        }
															
 
																                     ]
															
 
																                 });
															
 
																             },
															
--- a/WebService/src/main/resources/views/changeStaffPwdFlow.html
+++ b/WebService/src/main/resources/views/changeStaffPwdFlow.html
@@ -5,7 +5,7 @@
 
																       xmlns:vc="http://www.thymeleaf.org">
															
 
																 <head>
															
 
																     <meta charset="UTF-8"/>
															
 
																-    <title>修改密码|精诚物业服务有限公司</title>
															
 
																+    <title>修改密码|java110</title>
															
 
																     <vc:create name="commonTop"></vc:create>
															
 
																 </head>
															
 
																 <body>