教育培训bug修改

soc-modules/soc-modules-file/pom.xml

@@ -75,6 +75,28 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <!--不加此配置会导致引入的第三方jar包依赖 无法被打进jar包，导致线上报错-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArguments>
+                        <extdirs>${project.basedir}/src/main/resources/lib</extdirs>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -174,7 +174,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
     @Override
     public String generateEduTrainingPdf(Map<String, Object> data) throws Exception {
         PdfFilePathVo pathVo = getLocalFilePath(localFilePath, "edu", data.get("fileName").toString());
-        log.info("生成教育培训登记簿，当前绝对地址为：{}", pathVo.getAbsolutePath());
+        log.info("开始生成教育培训登记簿，当前绝对地址为：{}", pathVo.getAbsolutePath());
         final ItextPdfTableVo pdfTableVo = PdfUtil.createTable(pathVo.getAbsolutePath(), 6, 10);
         final Document document = pdfTableVo.getDocument();
         final PdfWriter writer = pdfTableVo.getWriter();
@@ -185,6 +185,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         PdfUtil.dealEduBody(document, table, tableFont, data);
         document.close();
         writer.close();
+        log.info("教育培训登记簿生成结束，当前绝对地址为：{}", pathVo.getAbsolutePath());
         //此处返回  /statics/edu/xxx.pdf
         return this.prefix + pathVo.getRelativePath();
     }

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

@@ -197,15 +197,13 @@
     <select id="selectSyncUserList" parameterType="com.xunmei.system.api.domain.SysUser"
             resultType="com.xunmei.system.api.domain.SysUser">
         select *
-        from sys_user u
-        <where>
+        from sys_user u where deleted=0
             <if test="source != null">
                 AND u.source =#{source}
             </if>
             <if test="orgId != null">
                 AND u.org_id =#{orgId}
             </if>
-        </where>
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">