BUG修复

docs/脚本/Oracle/oracle-ok.sql

@@ -19,12 +19,8 @@ where a.uuid=t1.uuid);
 ---3、EC部门数据写入聚才林（HrmDepartment-->JCL_ORG_DEPT）
 --插入数据
 insert into JCL_ORG_DEPT(dept_no, dept_name, dept_name_short,parent_comp,
-                         dept_principal,show_order,forbidden_tag,creator,delete_type,create_time,uuid)
-select a.departmentcode,a.departmentname,a.departmentmark,a.subcompanyid1,
-       cast(case instr(b.bmfzr,',')
-                when 0 then cast(b.bmfzr as varchar(2000))
-                else substr(cast(b.bmfzr as varchar(2000)),0,instr(b.bmfzr,',')-1)
-       end as int) ,a.showorder,nvl(a.canceled,0),1,0,SYSDATE,uuid
+                         show_order,forbidden_tag,creator,delete_type,create_time,uuid)
+select a.departmentcode,a.departmentname,a.departmentmark,a.subcompanyid1,a.showorder,nvl(a.canceled,0),1,0,SYSDATE,uuid
 from HrmDepartment a
 left join HrmDepartmentDefined b on a.id=b.deptid;
 
@@ -91,8 +87,10 @@ INSERT INTO WORKFLOW_BROWSERURL_MODULE(BROWSERID,MODULECODE)VALUES('666','workfl
 --职务
 create or replace view v_jcl_post as
 select id*-1 fid,post_name fname,0 fparentid from JCL_ORG_POST
+where nvl(delete_type,0)<>1
 union
-select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO;
+select id,post_info_name,post_id*-1 from JCL_ORG_POST_INFO
+where nvl(forbidden_tag,0)<>1 and nvl(delete_type,0)<>1;
 
 --newid函数
 CREATE OR REPLACE FUNCTION newid RETURN VARCHAR2
@@ -778,7 +776,7 @@ left join (select comp_id,sum(nvl(staff_num,0))  fcnt from JCL_ORG_STAFF
 left join (select subcompanyid1,count(1) fcnt from hrmresource where status<=3 group by subcompanyid1) f
 on f.subcompanyid1=b.id
 left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3
-where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;-- and a.id>=10
+where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
 
 --2、部门
 insert into  jcl_org_map
@@ -801,7 +799,7 @@ left join (select dept_id,sum(nvl(staff_num,0))  fcnt from JCL_ORG_STAFF
             group by dept_id) e on a.id=e.dept_id
 left join (select departmentid,count(1) fcnt from hrmresource where status<=3 group by departmentid) f on f.departmentid=b.id
 left join cus_fielddata g on c.id=g.id and g.scope='HrmCustomFieldByInfoType' and g.scopeid=3
-where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;-- and a.id>=100
+where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
 
 --3、岗位
 insert into  jcl_org_map
@@ -824,7 +822,7 @@ inner join hrmdepartment c on a.departmentid=c.id
 inner join jcl_org_dept d on a.uuid=b.uuid
 group by d.id,b.jobtitlename) f
 on f.id=a.parent_dept and a.job_name=f.jobtitlename
-where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;-- and a.id>=10
+where nvl(a.delete_type,0) <>1 and nvl(a.forbidden_tag,0) <>1;
 
 --4、人员