|
@@ -20,6 +20,7 @@ import com.jeeplus.core.excel.utils.EasyPoiUtil;
|
|
|
import com.jeeplus.core.query.QueryWrapperGenerator;
|
|
|
import com.jeeplus.security.util.SecurityUtils;
|
|
|
import com.jeeplus.sys.constant.CommonConstants;
|
|
|
+import com.jeeplus.sys.domain.Office;
|
|
|
import com.jeeplus.sys.domain.User;
|
|
|
import com.jeeplus.sys.service.OfficeService;
|
|
|
import com.jeeplus.sys.service.UserService;
|
|
@@ -225,6 +226,13 @@ public class UserController {
|
|
|
if ( isCheckLoginName ( "", user.getLoginName ( ) ) ) {
|
|
|
user.setPassword ( SecurityUtils.encryptPassword ( "123456" ) );
|
|
|
BeanValidators.validateWithException ( validator, user );
|
|
|
+ //查询人员公司信息
|
|
|
+ Office company = officeService.getOfficeByName(user.getCompanyDTO().getName(),"");
|
|
|
+ user.getCompanyDTO().setId(company.getId());
|
|
|
+ //查询人员部门信息
|
|
|
+ Office office = officeService.getOfficeByName(user.getOfficeDTO().getName(),user.getOfficeDTO().getParentName());
|
|
|
+ user.getOfficeDTO().setId(office.getId());
|
|
|
+ user.setLoginFlag("1");
|
|
|
userService.save ( UserWrapper.INSTANCE.toEntity ( user ) );
|
|
|
successNum++;
|
|
|
} else {
|