Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/user/service/UserService.java

@@ -188,11 +188,11 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
         addUserParam.setAccount(BeanUtil.copyProperties(account, AddUserAccountParam.class));
         Long userId = this.add(addUserParam);
         MoneyAccountEntity entity = new MoneyAccountEntity();
-        if (bizObj == BizObj.GeRen) {
-            entity.setUserId(userId);
-            moneyAccountService.add(entity);
-            return;
-        }
+//        if (bizObj == BizObj.GeRen) {
+//            entity.setUserId(userId);
+//            moneyAccountService.add(entity);
+//            return;
+//        }
         UserRegisterParam.Company company = userRegisterParam.getCompany();
         Assert.notNull(company, "公司信息不能为空");
 
@@ -201,9 +201,11 @@ public class UserService extends ServiceImpl<UserMapper, UserEntity> implements
                 .setUserId(userId);
         Long companyId = bizCompanyService.add(addBizCompanyParam);
         // 添加账户信息
+        if (bizObj.isTrans()) {
             entity.setStationId(companyId);
             moneyAccountService.add(entity);
         }
+    }
 
     /**
      * 修改密码