Merge remote-tracking branch 'company/master' into company-master

ruoyi-system/pom.xml

@@ -14,18 +14,7 @@
     <description>
         system系统模块
     </description>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>9</source>
-                    <target>9</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+
 
     <dependencies>
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/IndividualMemberServiceImpl.java

@@ -34,8 +34,8 @@ public class IndividualMemberServiceImpl implements IIndividualMemberService
 {
 //    private String rootPath="/Users/liangjiawei/Downloads/worddocx/";
 //    private String docxPath="/Users/liangjiawei/Downloads/worddocx/file/";
-      private String path = "/Users/liangjiawei/Downloads";
-//    private static  String path = "/upload/file";
+//      private String path = "/Users/liangjiawei/Downloads";
+    private static  String path = "/upload/file";
     private String rootPath="/upload/file/upload/worddocx/";
     private String docxPath="/upload/file/upload/worddocx/file/";
     @Autowired

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitMemberServiceImpl.java

@@ -28,12 +28,12 @@ import com.ruoyi.system.service.IUnitMemberService;
 @Service
 public class UnitMemberServiceImpl implements IUnitMemberService
 {
-    private String rootPath="/Users/liangjiawei/Downloads/worddocx/";
-    private String docxPath="/Users/liangjiawei/Downloads/worddocx/file/";
-    private String path = "/Users/liangjiawei/Downloads";
-//    private static  String path = "/upload/file";
-//    private String rootPath="/upload/file/upload/worddocx/";
-//    private String docxPath="/upload/file/upload/worddocx/file/";
+//    private String rootPath="/Users/liangjiawei/Downloads/worddocx/";
+//    private String docxPath="/Users/liangjiawei/Downloads/worddocx/file/";
+//    private String path = "/Users/liangjiawei/Downloads";
+    private static  String path = "/upload/file";
+    private String rootPath="/upload/file/upload/worddocx/";
+    private String docxPath="/upload/file/upload/worddocx/file/";
     @Autowired
     private UnitMemberMapper unitMemberMapper;
     @Autowired

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
-		where u.user_name = #{userName} and u.del_flag = '0'
+		where  u.user_name COLLATE utf8_bin = #{userName} and u.del_flag = '0'
 	</select>
 
 	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">