Jelajahi Sumber

Merge branch 'test' of http://git.tjyourong.com.cn/ctop/adsp-cloud into test

zhaoxian 3 tahun lalu
induk
melakukan
b7ddafb0a7

+ 3 - 2
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialCutFrameMapper.xml

@@ -50,7 +50,8 @@
 			photo_id = #{photoId}
 			photo_id = #{photoId}
 		LIMIT 1
 		LIMIT 1
 	    )
 	    )
-        AND signature != (
+        AND signature !=
+        IFNULL((
 	SELECT
 	SELECT
 		signature
 		signature
 	FROM
 	FROM
@@ -58,7 +59,7 @@
 	WHERE
 	WHERE
 		image_token = #{imageToken}
 		image_token = #{imageToken}
 	LIMIT 1
 	LIMIT 1
-        )
+        ),'')
         LIMIT 1
         LIMIT 1
     </select>
     </select>