fix0114

cloud-auth/pom.xml

@@ -74,6 +74,12 @@
         <dependency>
             <groupId>com.lutao</groupId>
             <artifactId>cloud-common-log</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--security-->
         <dependency>
@@ -233,6 +239,12 @@
             <artifactId>spring-security-web</artifactId>
             <version>${spring.security.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -245,6 +257,12 @@
             <artifactId>spring-security-config</artifactId>
             <version>${spring.security.version}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.security</groupId>
+                    <artifactId>spring-security-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>

cloud-common/cloud-common-log/pom.xml

@@ -21,6 +21,12 @@
 		<dependency>
 			<groupId>com.lutao</groupId>
 			<artifactId>cloud-common-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<!--UPMS接口模块-->
 		<dependency>
@@ -32,10 +38,22 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
 			<version>5.7.14</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.security</groupId>
+					<artifactId>spring-security-config</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

cloud-common/cloud-common-security/pom.xml

@@ -48,6 +48,12 @@
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-fileupload</groupId>
+					<artifactId>commons-fileupload</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
     </dependencies>
 </project>

cloud-oil/cloud-oil-biz/src/main/resources/mapper/ProblemRectificationDetailMapper.xml

@@ -42,7 +42,7 @@
                 and sra.evaluation_type = #{evaluationType}
             </if>
             <if test="year != null and year != ''">
-                and LEFT(sra.evaluation_code, 4) LIKE CONCAT('%',#{year},'%')
+                and evaluation_year = #{year}
             </if>
             <choose>
                 <when test="status == 1">