Просмотр исходного кода

单位树需要安装code_排序,以便确定根节点。

zhengqiang 5 лет назад
Родитель
Сommit
7b58ae8895

+ 2 - 0
common/src/main/java/com/jpsoft/smart/modules/base/dto/CompanyInfoDTO.java

@@ -1,12 +1,14 @@
 package com.jpsoft.smart.modules.base.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jpsoft.smart.modules.base.entity.CompanyInfo;
 import com.jpsoft.smart.modules.base.entity.CompanyPosition;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class CompanyInfoDTO {

+ 2 - 2
common/src/main/resources/mapper/base/CompanyInfo.xml

@@ -113,7 +113,7 @@
         select count(*) from base_company_info where id_=#{0} and del_flag = 0
     </select>
     <select id="list" resultMap="CompanyInfoMap">
-        select * from base_company_info where del_flag=0 order by sort_no asc
+        select * from base_company_info where del_flag=0 order by code_ asc,sort_no asc
     </select>
     <select id="search" parameterType="hashmap" resultMap="CompanyInfoMap">
         <![CDATA[
@@ -156,7 +156,7 @@
                 )
             </if>
         </trim>
-        order by a.sort_no asc,a.name_ asc
+        order by a.code_ asc,a.sort_no asc,a.name_ asc
     </select>
     <select id="countByParentId" resultType="long">
         select count(*) from base_company_info