Explorar o código

soc-modules-deploy模块后台代码-缺陷修复

humingshi-7@163.com hai 1 ano
pai
achega
c979f4cf2e

+ 1 - 1
project_data/sql/0.1.1/soc/soc.sql

@@ -690,7 +690,7 @@ CREATE TABLE `deploy_operation_log`  (
 -- ----------------------------
 drop view if exists hv_org;
 CREATE VIEW `hv_org` AS
-select id as org_id,code as org_code,name as org_name,parent_id,sort as order_no,path,deleted as is_deleted,type
+select id as org_id,code as org_code,short_name as org_name,parent_id,sort as order_no,path,deleted as is_deleted,type
 from sys_org;
 
 -- ----------------------------

+ 1 - 1
soc-modules/soc-modules-deploy/src/main/resources/mapper/HostInfoDao.xml

@@ -172,7 +172,7 @@
                 AND h.hostStatus = #{info.hostStatus}
             </if>
             <if test=" info.hostOrg != null ">
-                v.is_deleted = 0
+                and v.is_deleted = 0
                 <choose>
                     <when test=" info.checkSub == true">
                         and v.path like CONCAT('%', #{info.hostOrg}, '%' )