From b6449fc29b2ddaf2e38d1f45d5589b87d73cb4da Mon Sep 17 00:00:00 2001
From: Fred <Fred@Fred-PC.lan>
Date: Wed, 8 Aug 2018 11:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=AD=97=E6=AE=B5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/MyMetaObjectHandler.java        | 16 +++++++---------
 .../system/controller/UserController.java        |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/govmade/common/utils/MyMetaObjectHandler.java b/src/main/java/com/govmade/common/utils/MyMetaObjectHandler.java
index 6e57e51..d010be5 100644
--- a/src/main/java/com/govmade/common/utils/MyMetaObjectHandler.java
+++ b/src/main/java/com/govmade/common/utils/MyMetaObjectHandler.java
@@ -20,10 +20,10 @@ public class MyMetaObjectHandler extends MetaObjectHandler {
 		// 获取当前时间
 		Date date = DateUtil.date();
 		
-		metaObject.setValue("createBy", ue.getId());
-		metaObject.setValue("modifyBy", ue.getId());
-		metaObject.setValue("createTime", date);
-		metaObject.setValue("modifyTime", date);
+		setFieldValByName("createBy", ue.getId(), metaObject);
+		setFieldValByName("createTime", date, metaObject);
+		setFieldValByName("modifyBy", ue.getId(), metaObject);
+		setFieldValByName("modifyTime", date, metaObject);
 		setFieldValByName("state", 1, metaObject);
 	}
 
@@ -33,10 +33,8 @@ public class MyMetaObjectHandler extends MetaObjectHandler {
 		//获取当前登录用户
 		UserEntity ue = new UserEntity();
 		ue.setId(1L);
-		// 获取当前时间
-		Date date = DateUtil.date();
-		metaObject.setValue("modifyBy", ue.getId());
-		metaObject.setValue("modifyTime", date);
+		
+		setFieldValByName("modifyBy", ue.getId(), metaObject);
+		setFieldValByName("modifyTime", DateUtil.date(), metaObject);
 	}
-
 }
diff --git a/src/main/java/com/govmade/modules/system/controller/UserController.java b/src/main/java/com/govmade/modules/system/controller/UserController.java
index 5ee4712..c5dc49d 100644
--- a/src/main/java/com/govmade/modules/system/controller/UserController.java
+++ b/src/main/java/com/govmade/modules/system/controller/UserController.java
@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.govmade.common.utils.Assert;
 import com.govmade.common.utils.Constant;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.R;
@@ -23,6 +22,7 @@ import com.govmade.modules.basic.controller.AbstractController;
 import com.govmade.modules.system.entity.UserEntity;
 import com.govmade.modules.system.service.UserService;
 
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import io.swagger.annotations.ApiOperation;
 
@@ -122,7 +122,6 @@ public class UserController extends AbstractController {
      */
     @PutMapping("updatePassword")
     public R password(String password, String newPassword) {
-        Assert.isBlank(newPassword, "新密码不为能空");
 
         password = new Sha256Hash(password).toHex();
         newPassword = new Sha256Hash(newPassword).toHex();
-- 
2.17.1