Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -41,7 +41,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
     public List<TsInstitution> getInstitution() {
         //查询第一层机构
         QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
-        institutionQueryWrapper.eq("level",1);
+        institutionQueryWrapper.isNull("parent_id").or().eq("parent_id","");
         List<TsInstitution> institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper);
         for(TsInstitution tsInstitution:institutionRoot){
             tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
@@ -57,7 +57,6 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         List<Object> institutionObject=new ArrayList<>();
         QueryWrapper<TsInstitution> institutionQueryWrapper=new QueryWrapper<>();
         institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
-        institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1);
         List<TsInstitution> tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
         for(TsInstitution tsInstitutionNode:tsInstitutions){
             tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -29,10 +29,9 @@
 
     <insert id="batchInsert">
         insert into ts_institution (id,name,parent_id) values
-        (
         <foreach collection="list" item="institution" separator=",">
-            #{id},#{name},#{parentId}
+           ( #{institution.id},#{institution.name},#{institution.parentId} )
         </foreach>
-        )
+
     </insert>
 </mapper>