Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -259,7 +259,9 @@ public class SysUserController extends BaseController {
         }
         user.setUpdateBy(getUsername());
         user.setUpdateTime(new Date());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        if (!StringUtils.isEmpty(user.getPassword())) {
+            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        }
         int i = userService.updateUsersUpdate(user);
         LoginUser loginUser = getLoginUser();
         if (i != 0) {