报表导出修改

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUserInformation.java

@@ -67,7 +67,7 @@ public class SysUserInformation extends BaseEntity {
     @ApiModelProperty(value = "是否专职0是1否")
     private String isFullTime = "Y";
     @ApiModelProperty(value = "是否独立机构")
-    private String aloneDept = "Y";
+    private String aloneDept = "N";
     /**
      * 最高学历
      */

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -1010,6 +1010,7 @@ and
                     1 = 1
                   AND b.dept_id = 2
                   AND b.certificate_work = '1'
+                  AND a.is_manage = 'Y'
                   AND c.deleted = 0
                   AND c.path LIKE concat(#{orgPath}, '%')) AS certificatePeopleNumber
         FROM

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserInformationMapper.xml

@@ -215,8 +215,11 @@
                     <if test="workType != null">work_type =
                         #{workType},
                     </if>
-                    <if test="isFullTime != null">is_full_time =
-                        #{isFullTime},
+                    <if test="aloneDept != null">
+                        alone_dept =#{aloneDept},
+                    </if>
+                    <if test="isFullTime != null">
+                        is_full_time =#{isFullTime},
                     </if>
                     <if test="highestEducation != null">highest_education =
                         #{highestEducation},