From 04bf86cbdfebd681cac603b9f4a177e44b64a20a Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Thu, 2 Aug 2018 13:25:17 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-admin-api]:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=B4=A6=E6=88=B7=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=A0=A1=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/web/AdminAdminController.java         | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
index 84351963..cc8544d6 100644
--- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
+++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminAdminController.java
@@ -9,6 +9,7 @@ import org.linlinjava.litemall.core.validator.Sort;
 import org.linlinjava.litemall.db.domain.LitemallAdmin;
 import org.linlinjava.litemall.db.service.LitemallAdminService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -75,7 +76,19 @@ public class AdminAdminController {
             return ResponseUtil.unlogin();
         }
 
+        String username = admin.getUsername();
+        if(username == null){
+            return ResponseUtil.badArgument();
+        }
+        List<LitemallAdmin> adminList = adminService.findAdmin(username);
+        if(adminList.size() > 0){
+            return ResponseUtil.fail(402, "管理员已经存在");
+        }
+
         String rawPassword = admin.getPassword();
+        if(rawPassword == null || rawPassword.length() < 6){
+            return ResponseUtil.fail(402, "管理员密码长度不能小于6");
+        }
         BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
         String encodedPassword = encoder.encode(rawPassword);
         admin.setPassword(encodedPassword);
@@ -102,7 +115,7 @@ public class AdminAdminController {
         }
 
         Integer anotherAdminId = admin.getId();
-        if(anotherAdminId.intValue() == 1){
+        if(anotherAdminId == 1){
             return ResponseUtil.fail(403, "超级管理员不能修改");
         }
 
@@ -122,7 +135,7 @@ public class AdminAdminController {
         }
 
         Integer anotherAdminId = admin.getId();
-        if(anotherAdminId.intValue() == 1){
+        if(anotherAdminId == 1){
             return ResponseUtil.fail(403, "超级管理员不能删除");
         }
         adminService.deleteById(anotherAdminId);