Merge branch 'master-customer-management'

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

@@ -67,14 +67,14 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
             BeanUtils.copyProperties(staffUser, appStaffUserVo);
             Integer suId = staffUser.getSuId();
             //上级员工信息
-            if (suId!=null||suId!=0||appStaffUser.getPhone()!=null){
+            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){
+            if (uid!=null&&uid>0){
                 AppUserVo user = appUserDetailBiz.getUserInfoById(uid);
                 appStaffUserVo.setUName(StringUtil.isEmpty(user.getRealname())?user.getNickname():user.getRealname());
                 appStaffUserVo.setPhone(user.getUsername());