修改bug

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/MemberPasswordController.java

@@ -210,6 +210,7 @@ public class MemberPasswordController extends BaseController {
         AssertUtil.isTrue(!Md5.getMd5String(memberUpdateLoginPwdDTO.getOldLoginPwd()).equalsIgnoreCase(memberDb.getLoginPwd()), Language.translate("原密码不对,请重新输入",Language.EN_LANGUAGE_TYPE));
 
         memberModel.editLoginPwd(memberUpdateLoginPwdDTO, member.getMemberId());
+        stringRedisTemplate.delete(memberUpdateLoginPwdDTO.getMemberEmail());
         return SldResponse.success(Language.translate("修改登录密码成功",Language.EN_LANGUAGE_TYPE));
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/msg/seller/SellerVerifyController.java

@@ -148,7 +148,7 @@ public class SellerVerifyController extends BaseController {
         smsCodeModel.saveSmsCode(code);
 
         //将随机数存在redis中
-        stringRedisTemplate.opsForValue().set(mobile, smsResponse.getVerifyCode(), 60L * 10, TimeUnit.SECONDS);
+        stringRedisTemplate.opsForValue().set(mobile, smsResponse.getVerifyCode(), 60L * 5, TimeUnit.SECONDS);
         return SldResponse.success("发送成功");
     }
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/system/TplPcMallDataModel.java

@@ -88,12 +88,14 @@ public class TplPcMallDataModel {
         if (StringUtils.isEmpty(tplPcMallData.getDataId())) {
             throw new MallException("请选择要修改的数据");
         }
-        TplPcMallDataExample example = new TplPcMallDataExample();
-        example.setName(tplPcMallData.getName());
-        example.setStoreId(tplPcMallData.getStoreId());
-        example.setWebSite(tplPcMallData.getWebSite());
-        example.setDataIdNotEquals(tplPcMallData.getDataId());
-        AssertUtil.isTrue(tplPcMallDataReadMapper.countByExample(example) > 0, "模板名称重复，请重新输入");
+        if (!StringUtils.isEmpty(tplPcMallData.getName())){
+            TplPcMallDataExample example = new TplPcMallDataExample();
+            example.setName(tplPcMallData.getName());
+            example.setStoreId(tplPcMallData.getStoreId());
+            example.setWebSite(tplPcMallData.getWebSite());
+            example.setDataIdNotEquals(tplPcMallData.getDataId());
+            AssertUtil.isTrue(tplPcMallDataReadMapper.countByExample(example) > 0, "模板名称重复，请重新输入");
+        }
 
         int count = tplPcMallDataWriteMapper.updateByPrimaryKeySelective(tplPcMallData);
         if (count == 0) {