Merge branch 'master-customer-management' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppStaffUserBiz.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

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

@@ -104,8 +104,7 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
     public void addAppStaffUser(AppStaffUserDTO staffUserDTO){
         log.info("staffUserDTO={}",staffUserDTO);
         AppUserVo superAppUserVo= appUserDetailBiz.getUserInfoById(staffUserDTO.getSuId());
-        log.info("superAppUserVo={}",superAppUserVo);
-        AppUserVo userInfoById = appUserDetailBiz.getUserInfoById(staffUserDTO.getUid());
+        AppUserVo userInfoById = appUserDetailBiz.getUser(staffUserDTO.getUid());
         log.info("userInfoById={}",userInfoById);
         AppStaffUser appStaffUser = new  AppStaffUser();
 

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

@@ -202,4 +202,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         org.springframework.beans.BeanUtils.copyProperties(appUserDetail,appUserVo);
         return appUserVo;
     }
+
+    public AppUserVo getUser(Integer userId) {
+
+        return mapper.getUser(userId);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -33,4 +33,6 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     List<AppUserVo> getUserByUserIdList(@Param("userIds") List<Integer> userIds);
 
     List<UserStaffBo> findAllStaffsByCompanyIdAndPostionId(StaffStatisticsFindDTO staffStatisticsFindDTO);
+
+    AppUserVo getUser(Integer userId);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -322,4 +322,10 @@ from   `app_user_detail` as `aud` left join `app_user_login` as `aul` on aul.id=
         ) as `sell` on sell.user_id=saff.userId
         order by sell.sellAmount desc
     </select>
+    <select id="getUserInfo" resultMap="AppUserVoMap">
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    left join  app_user_detail d
+    on d.userid = l.id
+     where l.id = #{userId}  limit 1
+  </select>
 </mapper>
\ No newline at end of file