Merge branch 'master' of http://39.98.153.250:9080/bowintek/EmploymentSite

src/main/java/com/hz/employmentsite/controller/UserController.java

@@ -74,7 +74,7 @@ public class UserController {
     }
 
     @PostMapping("updatePassword")
-    public BaseResponse<Integer> updatePassword(@RequestBody ReqUpdatePasswordVo data) {
+    public BaseResponse<Integer> updatePassword(@RequestBody ReqUpdatePasswordVo data) throws Exception {
         String desDefault = desUtils.decoder(data.pwd_default.getToken(), dateUtils.DateToDateTime(dateUtils.StrToDate(data.pwd_default.getTm(), "yyyy/MM/dd HH:mm:ss")));
         String desConfirm = desUtils.decoder(data.pwd_confirm.getToken(), dateUtils.DateToDateTime(dateUtils.StrToDate(data.pwd_confirm.getTm(), "yyyy/MM/dd HH:mm:ss")));
 

src/main/java/com/hz/employmentsite/services/impl/UserServiceImpl.java

@@ -313,8 +313,11 @@ public class UserServiceImpl implements UserService {
         return sysUserMapper.updateByPrimaryKey(user);
     }
 
-    public Integer updatePassword(String userID, String newPassword, String updateBy) {
+    public Integer updatePassword(String userID, String newPassword, String updateBy) throws Exception {
         SysUser user = sysUserMapper.selectByPrimaryKey(userID);
+        if(newPassword.equals(user.getPassword())){
+            throw new Exception("新密码与旧密码不能相同！");
+        }
         user.setPassword(newPassword);
         user.setUpdateBy(updateBy);
         user.setUpdateTime(new Date());

src/main/java/com/hz/employmentsite/services/service/UserService.java

@@ -26,7 +26,7 @@ public interface UserService {
     SysUser addUser(String loginID,String userName,Integer userTypeID,String createBy);
     Integer updateUser(String userID,String userName,String createBy);
 
-    Integer updatePassword(String userID,String newPassword,String updateBy);
+    Integer updatePassword(String userID,String newPassword,String updateBy) throws Exception;
 
     List<SysMenu> getUserShortcutMenuList(String userID);