|
|
@@ -11,6 +11,7 @@ import com.tianhu.common.core.domain.R;
|
|
|
import com.tianhu.common.core.utils.CommonUtil;
|
|
|
import com.tianhu.common.core.utils.DateUtils;
|
|
|
import com.tianhu.common.core.utils.IdUtils;
|
|
|
+import com.tianhu.common.core.utils.SecurityUtils;
|
|
|
import com.tianhu.common.core.web.controller.BaseController;
|
|
|
import com.tianhu.common.log.annotation.Log;
|
|
|
import com.tianhu.common.log.enums.BusinessType;
|
|
|
@@ -250,16 +251,16 @@ public class OwnCompanyManageController extends BaseController
|
|
|
iSysCompanyService.createSysCompany(sysCompany);
|
|
|
|
|
|
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- lambdaQueryWrapper.eq(SysUser::getNickName, scyPhone);
|
|
|
+ lambdaQueryWrapper.eq(SysUser::getUserName, scyPhone);
|
|
|
List<SysUser> users = iSysUserService.findSysUsers(lambdaQueryWrapper);
|
|
|
SysUser createUser = null;
|
|
|
// 用户没有注册
|
|
|
if (users.size() == 0) {
|
|
|
String password = configService.selectConfigByKey("sys.user.initPassword");
|
|
|
SysUser sysUser = new SysUser();
|
|
|
- sysUser.setNickName(scyPhone);
|
|
|
- sysUser.setUserName(scyLegal);
|
|
|
- sysUser.setPassword(password);
|
|
|
+ sysUser.setNickName(scyLegal);
|
|
|
+ sysUser.setUserName(scyPhone);
|
|
|
+ sysUser.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
iSysUserService.createSysUser(sysUser);
|
|
|
createUser = iSysUserService.findSysUsers(lambdaQueryWrapper).get(0);
|
|
|
// 已存在用户
|
|
|
@@ -312,6 +313,9 @@ public class OwnCompanyManageController extends BaseController
|
|
|
userCompanyRel.setSucrUserId(createUser.getUserId());
|
|
|
userCompanyRel.setSucrCompanyId(scyId);
|
|
|
userCompanyRel.setSucrDeptId(deptList.get(0).getDeptId());
|
|
|
+ userCompanyRel.setSucrHandler("0");
|
|
|
+ iSysUserCompanyRelService.createSysUserCompanyRel(userCompanyRel);
|
|
|
+
|
|
|
|
|
|
// flowable数据
|
|
|
Map<String, Object> flowableRes = flowableService.addFlowableGroup(scyId, sysCompany.getScyName());
|
