Merge remote-tracking branch 'origin/pet' into dev

src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml

@@ -1563,7 +1563,7 @@
 	   WHERE
 		   f.ISDELETE = '0'
 		 AND f.SOURCE = '1'
-		 AND f.CREATOR = #{loginUserId}
+		 AND f.CREATOR LIKE CONCAT( CONCAT( '%', #{loginUserId} ), '%' )
 		 and f.ISPUNISH is null
    ) t ) as HIDDEN_COUNT,
 		(	SELECT COUNT(DISTINCT t.HIDDEN_ID) FROM (