Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java

@@ -124,6 +124,7 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
 		if (StringUtils.isNotBlank(query.getTitleNameKey())){
 			qw.like("att.titleNameKey", query.getTitleNameKey());
 		}
+		qw.groupBy("att.sid");
 		qw.orderByAsc("att.sortNo");
 		qw.eq("att.isDelete",0);
 		IPage<AsTechTitle> page = PagerUtil.queryToPage(pq);

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitledetail/AsTechTitleDetailMapper.xml

@@ -32,6 +32,6 @@
         AND n <= (
         LENGTH(techSid) - LENGTH(REPLACE (techSid, ',', '')) + 1
         )
-        AND titleSid = #{titleSid}
+        AND titleSid = #{titleSid}) AS a
     </select>
 </mapper>