|
|
@ -10,6 +10,7 @@ import com.glxp.api.common.enums.ResultEnum;
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
import com.glxp.api.common.res.BaseResponse;
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
import com.glxp.api.common.util.ResultVOUtils;
|
|
|
|
import com.glxp.api.constant.BusinessType;
|
|
|
|
import com.glxp.api.constant.BusinessType;
|
|
|
|
|
|
|
|
import com.glxp.api.dao.auth.AuthAdminDao;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
import com.glxp.api.entity.auth.AuthAdmin;
|
|
|
|
import com.glxp.api.entity.auth.CustomerInfoEntity;
|
|
|
|
import com.glxp.api.entity.auth.CustomerInfoEntity;
|
|
|
|
import com.glxp.api.entity.auth.UserRegisterEntity;
|
|
|
|
import com.glxp.api.entity.auth.UserRegisterEntity;
|
|
|
@ -327,6 +328,9 @@ public class RegisterController {
|
|
|
|
return ResultVOUtils.success("密码修改成功");
|
|
|
|
return ResultVOUtils.success("密码修改成功");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
AuthAdminDao authAdminDao;
|
|
|
|
|
|
|
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
@PostMapping("salewarehouse/register/check")
|
|
|
|
@PostMapping("salewarehouse/register/check")
|
|
|
|
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
|
|
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
|
@ -383,18 +387,20 @@ public class RegisterController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//创建新用户
|
|
|
|
//创建新用户
|
|
|
|
AuthAdmin authAdmin = new AuthAdmin();
|
|
|
|
AuthAdmin authAdmin = new AuthAdmin();
|
|
|
|
|
|
|
|
authAdmin.setId(generateUserId());
|
|
|
|
authAdmin.setCustomerId(customerId + "");
|
|
|
|
authAdmin.setCustomerId(customerId + "");
|
|
|
|
authAdmin.setPassWord(userRegisterEntity.getPassword());
|
|
|
|
authAdmin.setPassWord(userRegisterEntity.getPassword());
|
|
|
|
authAdmin.setCreateTime(DateUtil.parseDate(userRegisterEntity.getCheckTime()));
|
|
|
|
authAdmin.setCreateTime(DateUtil.parseDate(userRegisterEntity.getCheckTime()));
|
|
|
|
authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名,通过手机号登录
|
|
|
|
authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名,通过手机号登录
|
|
|
|
authAdmin.setEmployeeName(userRegisterEntity.getNickName());
|
|
|
|
authAdmin.setEmployeeName(userRegisterEntity.getNickName());
|
|
|
|
authAdmin.setCustomerId(userRegisterEntity.getCompanyId());
|
|
|
|
authAdmin.setCustomerId(userRegisterEntity.getCompanyId());
|
|
|
|
//默认给部门、仓库
|
|
|
|
//默认给部门、仓库 默认给随机用户ID,避免数据同步时出错覆盖
|
|
|
|
authAdmin.setLocDeptCode("1000");
|
|
|
|
authAdmin.setLocDeptCode("1000");
|
|
|
|
authAdmin.setLocInvCode("1000000");
|
|
|
|
authAdmin.setLocInvCode("1000000");
|
|
|
|
authAdmin.setUserFlag(1);
|
|
|
|
authAdmin.setUserFlag(1);
|
|
|
|
authAdmin.setLastModifyTime(new Date());
|
|
|
|
authAdmin.setLastModifyTime(new Date());
|
|
|
|
authAdminService.insertAuthAdmin(authAdmin);
|
|
|
|
authAdminDao.insert(authAdmin);
|
|
|
|
|
|
|
|
// authAdminService.insertAuthAdmin(authAdmin);
|
|
|
|
authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
|
|
|
|
authAdmin = authAdminService.findByUserName(authAdmin.getUserName());
|
|
|
|
|
|
|
|
|
|
|
|
//分配角色
|
|
|
|
//分配角色
|
|
|
@ -477,9 +483,6 @@ public class RegisterController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!b) {
|
|
|
|
if (!b) {
|
|
|
|
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
|
|
|
return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
|
|
|
|
}
|
|
|
|
}
|
|
|
|