修改客户管理

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

@@ -54,26 +54,35 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
         criteria.andEqualTo("isDel", 0);
         if (appStaffUser.getId() != null) {
             criteria.andEqualTo("id", appStaffUser.getId());
-            return mapper.selectOneByExample(example);
         }
-
         if (appStaffUser.getPhone() != null) {
             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) {
@@ -115,9 +124,6 @@ public class AppStaffUserBiz extends BaseBiz<AppStaffUserMapper, AppStaffUser> {
         appStaffUser.setPhone(userInfoById.getUsername());
         appStaffUser.setStatus(1);
 
-        if (POSITION_ID.equals(staffUserDTO.getPositionId())) {
-            throw  new BaseException("绑定的是员工");
-        }
         if (select(appStaffUser)) {
              insertSelective(appStaffUser);
         }else {