Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -95,4 +95,11 @@ public class AppUserDTO {
 	private Boolean isBindQQ;
     //用户上线
     private Integer  parentId;
+
+     //用户上线身份id
+	private Integer  parentPositionId;
+	//用户上线记录id
+	private Integer  parentPositionTempId;
+	//用户分公司id
+	private Integer  parentCompanyId;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -334,5 +334,15 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         }
     }
 
+    public  AppUserPositionTemp getOne(Integer userId){
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
+        List<AppUserPositionTemp> list=selectByExample(example);
+        if (list.size()>0){
+            return  list.get(0);
+        }
+        return null;
+    }
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -3,9 +3,7 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.UserRelationDTO;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelationTemp;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.bo.InviteMemberBO;
@@ -20,7 +18,6 @@ import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.mapper.AppUserRelationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
@@ -57,6 +54,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     @Value("${admin.validTime}")
     private  Long  validTime;
 
+    @Autowired
+    private  AppUserPositionTempBiz positionTempBiz;
+
     /**
      * 关系绑定
      * 规则A->B (B无有效上线+无有效下线)
@@ -369,6 +369,15 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
             parentId=relation.getParentId();
         }
         userDTO.setParentId(parentId);
+        if (parentId!=null&&parentId>0){
+           AppUserPositionTemp positionTemp= positionTempBiz.getOne(parentId);
+           if (positionTemp!=null){
+               userDTO.setParentPositionId(positionTemp.getPositionId());
+               userDTO.setParentPositionTempId(positionTemp.getId());
+               userDTO.setParentCompanyId(positionTemp.getCompanyId());
+           }
+        }
+
     }
 }
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -309,16 +309,23 @@ public class BaseOrder implements Serializable {
 	private Integer remark;
 
 	/**
-	 * 备注
+	 * 上级id
 	 */
 	@ApiModelProperty(value = "上级id")
 	@Column(name = "parent_user_id")
 	private Integer parentUserId;
 
 	/**
-	 * 备注
+	 * 上级公司id
 	 */
-	@ApiModelProperty(value = "备注")
+	@ApiModelProperty(value = "上级公司id")
 	@Column(name = "parent_user_company_id")
 	private Integer parentUserCompanyId;
+
+	/**
+	 * 上级公司员工id
+	 */
+	@ApiModelProperty(value = "上级公司员工id")
+	@Column(name = "parent_position_id")
+	private Integer parentPositionId;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -101,6 +101,8 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
 
         //设置上级
         baseOrder.setParentUserId(appUserDTO.getParentId());
+        baseOrder.setParentUserCompanyId(appUserDTO.getParentCompanyId());
+        baseOrder.setParentPositionId(appUserDTO.getParentPositionTempId());
 
         return baseOrder;
     }