合并代码

FrontService/src/main/java/com/java110/front/smo/impl/NavServiceSMOImpl.java

@@ -80,6 +80,7 @@ public class NavServiceSMOImpl extends BaseComponentSMO implements INavServiceSM
         resultUserInfo.put("levelCd", tmpUserInfo.getString("levelCd"));
         resultUserInfo.put("tel", CommonUtil.mobileEncrypt(tmpUserInfo.getString("tel")));
         resultUserInfo.put("email", tmpUserInfo.getString("email"));
+        resultUserInfo.put("userId",tmpUserInfo.getString("userId"));
         responseEntity = new ResponseEntity<String>(resultUserInfo.toJSONString(), HttpStatus.OK);
 
         return responseEntity;

StoreService/src/main/java/com/java110/store/listener/purchaseApply/AbstractPurchaseApplyBusinessServiceDataFlowListener.java

@@ -72,7 +72,7 @@ public abstract class AbstractPurchaseApplyBusinessServiceDataFlowListener exten
 
         currentPurchaseApplyInfo.put("bId", business.getbId());
         currentPurchaseApplyInfo.put("operate", currentPurchaseApplyInfo.get("operate"));
-        currentPurchaseApplyInfo.put("applyDetailId", currentPurchaseApplyInfo.get("applyDetailId"));
+        currentPurchaseApplyInfo.put("applyDstaffetailId", currentPurchaseApplyInfo.get("applyDetailId"));
         currentPurchaseApplyInfo.put("resOrderType", currentPurchaseApplyInfo.get("resOrderType"));
         currentPurchaseApplyInfo.put("description", currentPurchaseApplyInfo.get("description"));
         currentPurchaseApplyInfo.put("applyOrderId", currentPurchaseApplyInfo.get("applyOrderId"));

java110-bean/src/main/java/com/java110/dto/org/OrgDto.java

@@ -24,6 +24,7 @@ public class OrgDto extends PageDto implements Serializable {
     private String belongCommunityId;
     private String belongCommunityName;
     private String allowOperation;
+    private String staffId;
 
     private String parentOrgName;
 
@@ -140,4 +141,12 @@ public class OrgDto extends PageDto implements Serializable {
     public void setAllowOperation(String allowOperation) {
         this.allowOperation = allowOperation;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/org/ApiOrgDataVo.java

@@ -14,6 +14,7 @@ public class ApiOrgDataVo implements Serializable {
     private String belongCommunityName;
     private String description;
     private String allowOperation;
+    private String staffId;
 
     private String orgLevelName;
 
@@ -96,4 +97,12 @@ public class ApiOrgDataVo implements Serializable {
     public void setAllowOperation(String allowOperation) {
         this.allowOperation = allowOperation;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/staff/ApiStaffDataVo.java

@@ -32,6 +32,8 @@ public class ApiStaffDataVo implements Serializable {
 
     private String parentOrgId;
 
+    private String orgId;
+
     private String parentOrgName;
 
     private String staffId;
@@ -183,4 +185,13 @@ public class ApiStaffDataVo implements Serializable {
     public void setStaffName(String staffName) {
         this.staffName = staffName;
     }
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
 }

java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -17,6 +17,8 @@
         <result column="userId" property="userId"/>
         <result column="createTime" property="createTime"/>
         <result column="stateName" property="stateName"/>
+        <result column="endUserName" property="endUserName"/>
+        <result column="endUserTel" property="endUserTel"/>
         <!-- 一对多关系 -->
         <collection property="purchaseApplyDetailVo" ofType="com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo"  javaType="java.util.ArrayList">
             <id property="id" column="id"/>

java110-db/src/main/resources/mapper/user/OrgServiceDaoImplMapper.xml

@@ -103,12 +103,20 @@
         t.belong_community_id ,t.belong_community_id belongCommunityId,
         t.allow_operation ,t.allow_operation allowOperation
         from u_org t,t_dict td,u_org uo
+        <if test="staffId != null and staffId !=''">
+            ,u_org_staff_rel uosr
+        </if>
         where 1 =1
         and t.org_level = td.status_cd
         and td.table_name='u_org'
         and td.table_columns = 'org_level'
         and t.parent_org_id = uo.org_id
         and uo.status_cd = '0'
+        <if test="staffId != null and staffId !=''">
+            and uosr.org_id = t.org_id
+            and uosr.staff_id = #{staffId}
+            and uosr.status_cd = '0'
+        </if>
         <if test="orgName !=null and orgName != ''">
             and t.org_name= #{orgName}
         </if>
@@ -187,12 +195,20 @@
     <select id="queryOrgsCount" parameterType="Map" resultType="Map">
         select count(1) count
         from u_org t,t_dict td,u_org uo
+        <if test="staffId != null and staffId !=''">
+            ,u_org_staff_rel uosr
+        </if>
         where 1 =1
         and t.org_level = td.status_cd
         and td.table_name='u_org'
         and td.table_columns = 'org_level'
         and t.parent_org_id = uo.org_id
         and uo.status_cd = '0'
+        <if test="staffId != null and staffId !=''">
+            and uosr.org_id = t.org_id
+            and uosr.staff_id = #{staffId}
+            and uosr.status_cd = '0'
+        </if>
         <if test="orgName !=null and orgName != ''">
             and t.org_name= #{orgName}
         </if>

java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml

@@ -472,7 +472,7 @@
 
     <!-- 查询员工总量 -->
     <select id="getStaffs" parameterType="Map" resultType="Map">
-        select uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
+        select uo.org_id orgId,uo.org_name,uo.org_name orgName,u.user_id, u.user_id userId,u.name,u.name userName,u.email,u.address,u.location_cd,u.location_cd locationCd,
             u.age,u.sex,u.tel,u.level_cd,u.b_id,puo.org_id parentOrgId,puo.org_name parentOrgName
         from
             u_user u