update:修改bug

adc-da-sys/src/main/java/com/adc/da/sys/dao/UserEODao.java

@@ -177,4 +177,6 @@ public interface UserEODao extends BaseMapper<UserEO> {
 	//手机端接口 只查人
 	List<UserPhoneDTO> getUserByName(@Param("name") String name,@Param("page")Integer page);
 
+	String getName (@Param("id") String id);
+
 }

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -62,6 +62,7 @@ public class UserEO extends BaseEntity implements Serializable {
     private String institutionId;
     private String ssoId;
     private String token;
+    private String institutionNameDepartment;
     /**
      * java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
      * <p>字段列表：</p>

adc-da-sys/src/main/java/com/adc/da/sys/service/IUserEOService.java

@@ -81,5 +81,7 @@ public interface IUserEOService extends IService<UserEO> {
     //手机端接口 只查人
     List<UserPhoneDTO> getUserByName(String name,Integer page);
 
+    String getName(String name);
+
 
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/impl/UserEOServiceImpl.java

@@ -521,4 +521,9 @@ public class UserEOServiceImpl extends ServiceImpl<UserEODao, UserEO> implements
         return this.baseMapper.getUserByName(name,page);
     }
 
+	@Override
+	public String getName(String id) {
+		return this.baseMapper.getName(id);
+	}
+
 }

adc-da-sys/src/main/resources/mybatis/mapper/person/PersonCollectEOMapper.xml

@@ -410,7 +410,7 @@
             WHERE
             VALID_FLAG ='0'
             AND USER_ID = #{userId}
-            AND COLLECT_RES_ID =
+            AND COLLECT_RES_ID IN
 
             (
                     SELECT

adc-da-sys/src/main/resources/mybatis/mapper/sys/UserEOMapper.xml

@@ -815,4 +815,21 @@
         limit ${(page-1)*20},${20}
     </select>
 
+    <select id="getName" resultType="java.lang.String">
+        SELECT
+            concat(
+                t3.`name`,
+                concat(
+                    '_',
+                    concat(
+                        t2.`name`,
+                    concat( '_', t1.`name` ))))
+        FROM
+            ts_institution t1
+            LEFT JOIN ts_institution t2 ON t1.parent_id = t2.id
+            LEFT JOIN ts_institution t3 ON t2.parent_id = t3.id
+        WHERE
+        t1.id = #{id}
+    </select>
+
 </mapper>