|
@@ -79,30 +79,34 @@ public class GroupService extends OrgBaseService {
|
|
|
entity.setCreateTime(new Date());
|
|
|
groupRepository.save(entity);
|
|
|
|
|
|
- initService.initGroup();
|
|
|
+ response.add("id", entity.getId());
|
|
|
+
|
|
|
+ DmpMessage msg = new DmpMessage(OrgConstants.MESSAGE_GROUP_CREATE, entity.getId());
|
|
|
+ msg.setGroupCode(entity.getCode());
|
|
|
+ msg.setStr1(entity.getName());
|
|
|
+ response.add(msg);
|
|
|
+
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void initGroupData(DmpMessage msg){
|
|
|
+
|
|
|
+ String groupCode = msg.getGroupCode();
|
|
|
+ initService.initGroup(groupCode);
|
|
|
|
|
|
- // TODO 创建集团时自动创建顶级公司
|
|
|
Company company = new Company();
|
|
|
|
|
|
company.setId(OrgUtils.getUUID());
|
|
|
- company.setGroupCode(entity.getCode());
|
|
|
- company.setCode(entity.getCode());
|
|
|
- company.setName(entity.getName());
|
|
|
+ company.setGroupCode(msg.getGroupCode());
|
|
|
+ company.setCode(msg.getGroupCode());
|
|
|
+ company.setName(msg.getStr1());
|
|
|
company.setParentId("0");
|
|
|
company.setStatus(1);
|
|
|
- company.setCreateUser(orgParam.userId);
|
|
|
+ company.setCreateUser(msg.getUserId());
|
|
|
company.setCreateTime(new Date());
|
|
|
|
|
|
companyRepository.save(company);
|
|
|
|
|
|
- response.add("id", entity.getId());
|
|
|
-
|
|
|
- DmpMessage msg = new DmpMessage(OrgConstants.MESSAGE_GROUP_CREATE, entity.getId());
|
|
|
- msg.setGroupCode(entity.getCode());
|
|
|
- msg.setStr1(entity.getName());
|
|
|
- response.add(msg);
|
|
|
-
|
|
|
- return response;
|
|
|
}
|
|
|
|
|
|
@Transactional
|