Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-27 fdc8b22740924b634162bcced4d014846a64c0a6

 WebService/src/main/java/com/java110/web/smo/staff/impl/ChangeStaffPwdSMOImpl.java

@@ -34,7 +34,7 @@

    @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 @@
        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";