常用标签维护——获取列表修改

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -135,7 +134,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      * @return
      */
     public IPage<GetDeptInfoDTO> getDeptInfos(GetDeptInfoVO getDeptInfoVO) {
-        //获取标签修改时间和修改人
+        /*//获取标签修改时间和修改人
         QueryWrapper<QuestionUsual> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
         List<QuestionUsual> questionUsualList = this.list(queryWrapper);
@@ -144,16 +143,16 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
             for (QuestionUsual questionUsual : questionUsualList) {
                 map.put(questionUsual.getDeptId(), questionUsual);
             }
-        }
+        }*/
         //分页查询科室
         IPage<GetDeptInfoDTO> iPage = deptInfoFacade.getAllDeptInfo(getDeptInfoVO);
-        //将科室的修改人替换成常用标签的修改人
+        /*//将科室的修改人替换成常用标签的修改人
         for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
             if (map.get(getDeptInfoDTO.getId()) != null) {
                 getDeptInfoDTO.setModifier(map.get(getDeptInfoDTO.getId()).getModifier());
                 getDeptInfoDTO.setGmtModified(map.get(getDeptInfoDTO.getId()).getGmtModified());
             }
-        }
+        }*/
         //获取用户信息
         List<String> ids = new ArrayList<>();
         for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {

icssman-service/src/main/resources/mapper/DeptInfoMapper.xml

@@ -15,11 +15,18 @@
     </resultMap>
 
     <select id="getAllDeptInfo" resultType="com.diagbot.dto.GetDeptInfoDTO">
-        SELECT * FROM `icss_dept_info` WHERE is_deleted = 'N'
-         <if test="name != null and name != ''">
-             AND `name` LIKE CONCAT('%',#{name},'%')
-         </if>
-        order by gmt_modified desc
+        SELECT
+        DISTINCT a.id,a.gmt_create,b.gmt_modified,b.creator,b.modifier,a.`name`,a.remark
+        FROM
+        `icss_dept_info` a
+        LEFT JOIN icss_question_usual b ON a.id = b.dept_id
+        WHERE
+        a.is_deleted = 'N' AND b.is_deleted = 'N'
+        <if test="name != null and name != ''">
+            AND a.`name` LIKE CONCAT('%',#{name},'%')
+        </if>
+        ORDER BY
+        b.gmt_modified DESC
     </select>
 
     <select id="getDeptName" resultType="com.diagbot.dto.DeptInfoDTO">