Merge remote-tracking branch 'origin/master'

许鹏程

2023-05-24 5839384228e2f10d880d23c7a1c99ba86430634c

 product-server-admin/src/main/java/com/product/admin/service/PersonalCenterService.java

@@ -98,7 +98,7 @@
        StringBuilder sql = new StringBuilder();
        SystemUser currentUser = SpringMVCContextHolder.getCurrentUser();
        if (!currentUser.isManager()) {
            sql.append("\n SELECT b.user_phone_number,b.user_primary_email,b.user_name,a.sex,b.user_id,b.user_signature,b.thumbnail_img,c.job_post_name,d.org_level_name dept_name,d.uuid dept_uuid,d.org_level_uuid,d.org_level_all ,e.org_level_name company_name FROM  product_sys_staffs a  ");
            sql.append("\n SELECT b.gender, b.user_phone_number,b.user_primary_email,b.user_name,a.sex,b.user_id,b.user_signature,b.thumbnail_img,c.job_post_name,d.org_level_name dept_name,d.uuid dept_uuid,d.org_level_uuid,d.org_level_all ,e.org_level_name company_name FROM  product_sys_staffs a  ");
            sql.append("\n join product_sys_users b on a.user_id=b.user_id and a.user_id=? ");
            sql.append("\n join product_sys_job_posts c on a.job_post_uuid=c.uuid ");
            sql.append("\n join product_sys_org_levels d on d.uuid=a.dept_uuid ");