Skip to content

C
cloud-platform
Commit 9f013ba8 authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'master-customer-management' into dev 

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
parents 57702f43 f6425a20
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 55 deletions
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java
View file @ 9f013ba8
...@@ -54,26 +54,35 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> { ...@@ -54,26 +54,35 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
criteria.andEqualTo("isDel", 0); criteria.andEqualTo("isDel", 0);
if (appStaffUser.getId() != null) { if (appStaffUser.getId() != null) {
criteria.andEqualTo("id", appStaffUser.getId()); criteria.andEqualTo("id", appStaffUser.getId());
return mapper.selectOneByExample(example);
} }
if (appStaffUser.getPhone() != null) { if (appStaffUser.getPhone() != null) {
criteria.andEqualTo("phone", appStaffUser.getPhone()); criteria.andEqualTo("phone", appStaffUser.getPhone());
List<AppStaffUser> appStaffUsers = mapper.selectByExample(example);
if (CollectionUtil.isNotEmpty(appStaffUsers)) {
AppStaffUser staffUser = appStaffUsers.get(0);
AppStaffUserVo appStaffUserVo = new AppStaffUserVo();
BeanUtils.copyProperties(staffUser, appStaffUserVo);
Integer suId = staffUser.getSuId();
AppUserVo userInfoById = appUserDetailBiz.getUserInfoById(suId);
appStaffUserVo.setEmployeeName(userInfoById.getRealname());
appStaffUserVo.setEmployeePhone(userInfoById.getUsername());
return appStaffUserVo;
}
} }
return null;
List<AppStaffUser> appStaffUsers = mapper.selectByExample(example);
if (CollectionUtil.isNotEmpty(appStaffUsers)) {
AppStaffUser staffUser = appStaffUsers.get(0);
AppStaffUserVo appStaffUserVo = new AppStaffUserVo();
BeanUtils.copyProperties(staffUser, appStaffUserVo);
Integer suId = staffUser.getSuId();
//上级员工信息
if (suId!=null||suId!=0||appStaffUser.getPhone()!=null){
AppUserVo spuser = appUserDetailBiz.getUserInfoById(suId);
appStaffUserVo.setEmployeeName(spuser.getRealname());
appStaffUserVo.setEmployeePhone(spuser.getUsername());
}
//客户信息
Integer uid = staffUser.getUid();
if (uid!=null||uid!=0){
AppUserVo user = appUserDetailBiz.getUserInfoById(uid);
appStaffUserVo.setUName(StringUtil.isEmpty(user.getRealname())?user.getNickname():user.getRealname());
appStaffUserVo.setPhone(user.getUsername());
}
return appStaffUserVo;
}
return null;
} }
public boolean select(AppStaffUser appStaffUser) { public boolean select(AppStaffUser appStaffUser) {
...@@ -115,9 +124,6 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> { ...@@ -115,9 +124,6 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
appStaffUser.setPhone(userInfoById.getUsername()); appStaffUser.setPhone(userInfoById.getUsername());
appStaffUser.setStatus(1); appStaffUser.setStatus(1);
if (POSITION_ID.equals(staffUserDTO.getPositionId())) {
throw new BaseException("绑定的是员工");
}
if (select(appStaffUser)) { if (select(appStaffUser)) {
insertSelective(appStaffUser); insertSelective(appStaffUser);
}else { }else {
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
View file @ 9f013ba8
...@@ -67,58 +67,64 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe ...@@ -67,58 +67,64 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
* @param userId * @param userId
* @param parentId * @param parentId
*/ */
public void bindRelation(Integer userId, Integer parentId, Integer type) { public void bindRelation(Integer userId,Integer parentId,Integer type){
if (userId.equals(parentId)) { try {
log.info("----userId===" + userId + "----parentId====" + parentId + "----自己不能成为自己的上线"); if (userId.equals(parentId)){
return; log.info("----userId==="+userId+"----parentId===="+parentId+"----自己不能成为自己的上线");
} return;
}
/* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId); /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
if (appUserVo==null){ if (appUserVo==null){
log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在"); log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
return; return;
}*/ }*/
AppUserVo appUserVo = userDetailBiz.getUserInfoById(parentId); AppUserVo appUserVo=userDetailBiz.getUserInfoById(parentId);
if (appUserVo == null) { if (appUserVo==null){
log.info("----userId===" + userId + "----parentId====" + parentId + "----该上线用户不存在"); log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
return; return;
} }
AppUserRelation relation = getMyBiz().getRelationByUserId(parentId); AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
Long time = System.currentTimeMillis(); Long time=System.currentTimeMillis();
if (relation == null) { if(relation==null){
relation = new AppUserRelation(); relation=new AppUserRelation();
relation.setUserId(parentId); relation.setUserId(parentId);
relation.setBindType(type);
insertSelective(relation);
}
Long bindTime = time - validTime;
//判断用户是否有有效的下线
if (getCountByParentId(userId, bindTime) == 0L) {
relation = getMyBiz().getRelationByUserId(userId);
if (relation == null) {
relation = new AppUserRelation();
relation.setUserId(userId);
relation.setParentId(parentId);
relation.setBindType(type); relation.setBindType(type);
relation.setBindTime(time);
insertSelective(relation); insertSelective(relation);
} else { }
//判断用户是否有有效的上线 Long bindTime=time-validTime;
log.info("----userId===" + userId + "----bindTime====" + bindTime + "----relation.getBindTime()===" + relation.getBindTime()); //判断用户是否有有效的下线
if (relation.getParentId() == null || relation.getParentId() == 0 || (relation.getIsForever() != 1 && validTime > 0 && relation.getBindTime() < bindTime)) { if (getCountByParentId(userId,bindTime)==0L){
relation=getMyBiz().getRelationByUserId(userId);
if(relation==null){
relation=new AppUserRelation();
relation.setUserId(userId);
relation.setParentId(parentId); relation.setParentId(parentId);
relation.setBindType(type); relation.setBindType(type);
relation.setBindTime(time); relation.setBindTime(time);
getMyBiz().updRelation(relation); insertSelective(relation);
}else {
//判断用户是否有有效的上线
log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
relation.setParentId(parentId);
relation.setBindType(type);
relation.setBindTime(time);
getMyBiz().updRelation(relation);
}
}
if (relation != null){
AppStaffUserDTO staffUserDTO=new AppStaffUserDTO();
staffUserDTO.setSuId(relation.getParentId());
staffUserDTO.setUid(relation.getUserId());
staffUserBiz.addAppStaffUser(staffUserDTO);
} }
} }
if (relation != null){ }catch (Exception e){
AppStaffUserDTO staffUserDTO=new AppStaffUserDTO(); log.info("网络异常===" + e.getMessage());
staffUserDTO.setSuId(relation.getParentId());
staffUserDTO.setUid(relation.getUserId());
staffUserBiz.addAppStaffUser(staffUserDTO);
}
} }
} }
//首页关系绑定 //首页关系绑定
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment