修复当未设置角色时，无法清除角色

zhou-hao · zhou-hao · commit be412bb9d9c0 · 2016-10-19T19:20:52.000+08:00
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/user/UserServiceImpl.java
@@ -43,12 +43,12 @@ protected UserMapper getMapper() {
         return this.userMapper;
     }
 
-    public User selectByUserName(String username)  {
+    public User selectByUserName(String username) {
         return this.getMapper().selectByUserName(username);
     }
 
     @Override
-    public String insert(User data)  {
+    public String insert(User data) {
         tryValidPo(data);
         Assert.isNull(selectByUserName(data.getUsername()), "用户已存在!");
         data.setId(RandomUtil.randomChar(6));
@@ -59,7 +59,7 @@ public String insert(User data)  {
         userMapper.insert(new InsertParam<>(data));
         String id = data.getId();
         //添加角色关联
-        if (data.getUserRoles().size() != 0) {
+        if (data.getUserRoles() != null) {
             for (UserRole userRole : data.getUserRoles()) {
                 userRole.setId(RandomUtil.randomChar());
                 userRole.setUserId(data.getId());
@@ -70,12 +70,12 @@ public String insert(User data)  {
     }
 
     @Override
-    public List<String> batchInsert(List<User> data, boolean skipFail)  {
+    public List<String> batchInsert(List<User> data, boolean skipFail) {
         throw new UnsupportedOperationException("不支持此操作");
     }
 
     @Override
-    public int update(User data)  {
+    public int update(User data) {
         tryValidPo(data);
         User old = this.selectByUserName(data.getUsername());
         if (old != null && !old.getId().equals(data.getId())) {
@@ -87,7 +87,7 @@ public int update(User data)  {
             userMapper.updatePassword(data);
         }
         int i = userMapper.update(new UpdateParam<>(data).excludes("status", "password", "createDate"));
-        if (data.getUserRoles().size() != 0) {
+        if (data.getUserRoles() != null) {
             //删除所有
             userRoleMapper.deleteByUserId(data.getId());
             for (UserRole userRole : data.getUserRoles()) {
@@ -100,7 +100,7 @@ public int update(User data)  {
     }
 
     @Override
-    public void initAdminUser(User user)  {
+    public void initAdminUser(User user) {
         QueryParam queryParam = new QueryParam().noPaging();
         queryParam.orderBy("sortIndex");
         List<Module> modules = moduleService.select(queryParam);
@@ -112,30 +112,30 @@ public void initAdminUser(User user)  {
     }
 
     @Override
-    public void initGuestUser(User user)  {
+    public void initGuestUser(User user) {
         List<UserRole> userRoles = userRoleMapper.select(new QueryParam().where("roleId", "guest").noPaging());
         user.setUserRoles(userRoles);
         user.initRoleInfo();
     }
 
     @Override
-    public void enableUser(String id)  {
+    public void enableUser(String id) {
         User user = selectByPk(id);
         if (user == null) throw new NotFoundException("用户不存在!");
         user.setStatus(1);
         getMapper().update(new UpdateParam<>(user).includes("status").where("id", id));
     }
 
     @Override
-    public void disableUser(String id)  {
+    public void disableUser(String id) {
         User user = selectByPk(id);
         if (user == null) throw new NotFoundException("用户不存在!");
         user.setStatus(-1);
         getMapper().update(new UpdateParam<>(user).includes("status").where("id", id));
     }
 
     @Override
-    public int delete(String s)  {
+    public int delete(String s) {
         throw new BusinessException("服务不支持", 500);
     }
 }
