Merge remote-tracking branch 'origin/master'

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -106,6 +106,10 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
 
     @Override
     protected void saveBefore(UserEntity entity, Context context) throws AppException {
+        UserEntity sysUser = this.findByLoginName(entity.getLoginName());
+        if(sysUser!=null){
+            throw new AppException("用户名重复");
+        }
         this.doHandlerUser(entity);
     }