Merge branch 'feature/202310月零散迭代' into 'developer'

Feature/202310月零散迭代

See merge request !1544

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -380,8 +380,8 @@ public class StaffController extends WebBaseController {
             }
         }
         if(null != login.getSuperAdmin() && login.getSuperAdmin()==1 && manageFlag == 1) {
-            ClerkDTO superClerk =   this.clerkService.getSuperAdminByEnterpriseId(enterpriseId) ;
-            if(superClerk.getPhoneNumber().contains(search)) {
+            ClerkDTO superClerk = this.clerkService.getSuperAdminByEnterpriseId(enterpriseId) ;
+            if(superClerk.getPhoneNumber().contains(search) || superClerk.getClerkCode().equals(search)) {
                 superClerk.setClerkName("超级管理员");
                 ClerkInfoVo superVO = EntityUtil.changeEntityByJSON(ClerkInfoVo.class, superClerk) ;
                 // 判断是否有有关联
@@ -564,20 +564,17 @@ public class StaffController extends WebBaseController {
         }
         mergeClerkInfo(voList, wxEnterpriseId);
         String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
-        List<String> titleList =Lists.newArrayList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购");
-        List<String> fileList = Lists.newArrayList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName");
+        List<String> titleList =Lists.newArrayList("姓名", "职务", "部门", "手机号", "关联状态", "关联导购","成员明文userid");
+        List<String> fileList = Lists.newArrayList("staffName", "position", "departmentName", "phoneNumber", "relationFlag", "clerkName","wxUserId");
         if (flag){
             titleList.add("所属商户");
             fileList.add("enterpriseName");
         }
         //针对未升级好办独立应用的企业，导出表格增加导出字段：成员明文userid、成员加密userid、许可状态、许可激活时间、许可到期时间
         if(enterprise != null && enterprise.getWxSecurityType() != 5){
-            titleList.add("成员明文userid");
-            titleList.add("成员加密userid");
             titleList.add("许可状态");
             titleList.add("许可激活时间");
             titleList.add("许可到期时间");
-            fileList.add("wxUserId");
             fileList.add("wxOpenUseId");
             fileList.add("status");
             fileList.add("activeTime");