master

Reviewed-on: #289

docs/sql20240530/DM.sql

@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
+/
+
+delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
+/
+delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
+/
+delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
+/
+delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
+/
+delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
+/
+delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
 /

docs/sql20240530/GS.sql

@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
+/
+
+delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
+/
+delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
+/
+delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
+/
+delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
+/
+delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
+/
+delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
 /

docs/sql20240530/JC.sql

@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
+/
+
+delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
+/
+delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
+/
+delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
+/
+delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
+/
+delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
+/
+delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
 /

docs/sql20240530/MySql.sql

@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label'
 ;
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
+;
+
+delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
+;
+delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
+;
+delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
+;
+delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
+;
+delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
+;
+delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' )
+;
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=char_length(labelname)  )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=char_length(labelname)  ))  limit 1
+;
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = ''    )
+;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1
+;
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
+;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
 ;

docs/sql20240530/Oracle.sql

@@ -9703,3 +9703,124 @@ delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and ty
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
 /
+
+delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
+/
+delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
+/
+delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
+/
+delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
+/
+delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
+/
+delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null )
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null    )
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
+/

docs/sql20240530/PG.sql

@@ -8262,81 +8262,81 @@ delete from HtmlModuleLabel where indexId = 547595 and moduleCode = 'HRM' and ty
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547595) ;
 /
-delete from HtmlLabelIndex where id = 547599 and ( trim(indexdesc) is null ) ;
+delete from HtmlLabelIndex where id = 547598 and ( indexdesc is null or indexdesc = '' ) ;
 /
-insert into HtmlLabelIndex(id,indexdesc) select  547599,'部门简称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547599 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+insert into HtmlLabelIndex(id,indexdesc) select  547598,'部门名称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547598 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'部门简称' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'部门名称' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+delete from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'Department Abbreviation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'Department Name' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'部門簡稱' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'部門名稱' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlModuleLabel where indexId = 547599 and moduleCode = 'HRM' and type = 'label' ;
+delete from HtmlModuleLabel where indexId = 547598 and moduleCode = 'HRM' and type = 'label' ;
 /
-insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547599) ;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547598) ;
 /
-delete from HtmlLabelIndex where id = 547598 and ( trim(indexdesc) is null ) ;
+delete from HtmlLabelIndex where id = 547599 and ( indexdesc is null or indexdesc = '' ) ;
 /
-insert into HtmlLabelIndex(id,indexdesc) select  547598,'部门名称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547598 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+insert into HtmlLabelIndex(id,indexdesc) select  547599,'部门简称' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547599 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'部门名称' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'部门简称' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+delete from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'Department Name' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'Department Abbreviation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547598 as indexid ,'部門名稱' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547598 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547599 as indexid ,'部門簡稱' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547599 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlModuleLabel where indexId = 547598 and moduleCode = 'HRM' and type = 'label' ;
+delete from HtmlModuleLabel where indexId = 547599 and moduleCode = 'HRM' and type = 'label' ;
 /
-insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547598) ;
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547599) ;
 /
-delete from HtmlLabelIndex where id = 547597 and ( trim(indexdesc) is null ) ;
+delete from HtmlLabelIndex where id = 547597 and ( indexdesc is null or indexdesc = '' ) ;
 /
-insert into HtmlLabelIndex(id,indexdesc) select  547597,'标识' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547597 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+insert into HtmlLabelIndex(id,indexdesc) select  547597,'标识' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547597 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'标识' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'标识' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+delete from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'Identifier' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'Identifier' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'標識' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547597 as indexid ,'標識' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547597 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
 delete from HtmlModuleLabel where indexId = 547597 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547597) ;
 /
-delete from HtmlLabelIndex where id = 547596 and ( trim(indexdesc) is null ) ;
+delete from HtmlLabelIndex where id = 547596 and ( indexdesc is null or indexdesc = '' ) ;
 /
-insert into HtmlLabelIndex(id,indexdesc) select  547596,'责任编辑' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547596 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+insert into HtmlLabelIndex(id,indexdesc) select  547596,'责任编辑' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547596 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'责任编辑' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'责任编辑' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+delete from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'Responsible Editor' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'Responsible Editor' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
 /
-delete from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( trim(labelname) is null    ) ;
+delete from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( labelname is null or labelname = ''    ) ;
 /
-insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'責任編輯' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547596 as indexid ,'責任編輯' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547596 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
 /
 delete from HtmlModuleLabel where indexId = 547596 and moduleCode = 'HRM' and type = 'label' ;
 /
@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
+/
+
+delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
+/
+delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
+/
+delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
+/
+delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
+/
+delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
+/
+delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = ''   or length(labelname)!=octet_length(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> ''   and length(labelname)=octet_length(labelname)  ))  limit 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = ''    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> ''   ))  limit 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
 /

docs/sql20240530/SQLServer.sql

@@ -9704,3 +9704,123 @@ GO
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733)
 GO
 
+delete from HtmlLabelIndex where id = 547469 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469)
+GO
+delete from HtmlLabelIndex where id = 547470 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470)
+GO
+delete from HtmlLabelIndex where id = 547471 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471)
+GO
+delete from HtmlLabelIndex where id = 547472 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472)
+GO
+delete from HtmlLabelIndex where id = 547474 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474)
+GO
+delete from HtmlLabelIndex where id = 547949 and ( indexdesc is null or indexdesc = '' )
+GO
+insert into HtmlLabelIndex(id,indexdesc) select  top 1  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( indexdesc is not null and indexdesc <> '' ))
+GO
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is null or labelname = ''   or labelname like '%[吖-座]%'  )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( labelname is not null and labelname <> ''   and labelname not like '%[吖-座]%'  ))
+GO
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is null or labelname = ''    )
+GO
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  top 1  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( labelname is not null and labelname <> ''   ))
+GO
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label'
+GO
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949)
+GO

docs/sql20240530/ST.sql

@@ -9702,4 +9702,125 @@ insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  5
 delete from HtmlModuleLabel where indexId = 547733 and moduleCode = 'HRM' and type = 'label' ;
 /
 insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547733) ;
+/
+
+delete from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547469,'冻结数不能大于剩余编制数！' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547469 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'冻结数不能大于剩余编制数！' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'The frozen number cannot be greater than the remaining prepare number!' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547469 as indexid ,'凍結數不能大於剩餘編製數！' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547469 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547469 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547469) ;
+/
+delete from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547470,'强控策略下请先释放当前冻结数后再完成入职操作' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547470 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'强控策略下请先释放当前冻结数后再完成入职操作' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'Under the strong control strategy, please release the current frozen amount before completing the onboarding operation' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547470 as indexid ,'強控策略下請先釋放當前凍結數后再完成入職操作' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547470 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547470 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547470) ;
+/
+delete from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547471,'强控策略下不容许超编' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547471 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'强控策略下不容许超编' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'Overloading is not allowed under the strong control strategy' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547471 as indexid ,'強控策略下不容許超編' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547471 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547471 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547471) ;
+/
+delete from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547472,'调整数量不可大于在编数' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547472 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'调整数量不可大于在编数' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'The adjustment quantity cannot be greater than the current number' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547472 as indexid ,'調整數量不可大於在編數' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547472 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547472 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547472) ;
+/
+delete from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547474,'未查询到对应编制方案下的组织编制信息' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547474 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查询到对应编制方案下的组织编制信息' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'The organization''s prepare information under the corresponding prepare scheme is not Query' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547474 as indexid ,'未查詢到對應編製方案下的組織編製信息' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547474 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547474 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547474) ;
+/
+delete from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is null ) ;
+/
+insert into HtmlLabelIndex(id,indexdesc) select  547949,'当前冻结数为0,无需释放' from HtmlLabelIndex where not exists (select id from HtmlLabelIndex where id = 547949 and ( trim(indexdesc) is not null ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'当前冻结数为0,无需释放' as content,7  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=7 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is null   or length(labelname)!=lengthb(labelname)  ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'The current frozen number is 0, no need to release it' as content,8  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=8 and ( trim(labelname) is not null   and length(labelname)=lengthb(labelname)  ))  and rownum = 1 ;
+/
+delete from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is null    ) ;
+/
+insert into HtmlLabelInfo(indexid,labelname,languageid) select * from (select  547949 as indexid ,'當前凍結數為0,無需釋放' as content,9  as languageid from HtmlLabelInfo) t where not exists (select indexid,languageid from HtmlLabelInfo where indexid = 547949 and languageid=9 and ( trim(labelname) is not null   ))  and rownum = 1 ;
+/
+delete from HtmlModuleLabel where indexId = 547949 and moduleCode = 'HRM' and type = 'label' ;
+/
+insert into HtmlModuleLabel(type,moduleCode,indexId) values ('label','HRM',547949) ;
 /

src/com/api/browser/service/impl/JobBrowserService.java

@@ -25,6 +25,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
+import weaver.hrm.company.SubCompanyComInfo;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -77,13 +78,14 @@ public class JobBrowserService extends BrowserService {
         Map<String, Object> apidatas = new HashMap<>();
         String q = Util.null2String(httpServletRequest.getParameter("q"));
         List<String> sqlParams = new ArrayList<>();
+        SubCompanyComInfo subInfo = new SubCompanyComInfo();
         String keyword = "";
         if (q.length() > 0) {
             keyword = "%" + q + "%";
         }
         RecordSet rs = new RecordSet();
         String sqlwhere = " where t.delete_type = 0 ";
-        String backfields = "t.id, t.job_no, h.jobtitlename as name ";
+        String backfields = "t.id,t.ec_company, t.job_no, h.jobtitlename as name ";
         String fromSql = "FROM jcl_org_job t left join hrmjobtitles h on t.ec_jobTitle = h.id  ";
         String orderby = " order by t.id ";
         sqlwhere += "  ";
@@ -104,7 +106,8 @@ public class JobBrowserService extends BrowserService {
             Map<String, String> item = new HashMap<>(3);
             item.put("id", Util.null2String(rs.getString("id")));
             String name = Util.null2String(rs.getString("name"));
-            item.put("name", name);
+            String subCompanyname = subInfo.getSubCompanyname(Util.null2String(rs.getString("ec_company")));
+            item.put("name", name+"("+subCompanyname+")");
             item.put("title", name);
             datas.add(item);
         }
@@ -234,7 +237,7 @@ public class JobBrowserService extends BrowserService {
                     compList = MapperProxyFactory.getProxy(CompMapper.class).listParent();
                 }
                 // 获取顶层分部
-                compList.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item));
+                compList.stream().sorted(Comparator.comparingDouble(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).forEach(item -> buildCompNodes(treeNodes, compHasSubs, item));
             } else if ("1".equals(params.getType())) {
                 // 当前节点下的元素
                 CompPO compBuild = CompPO.builder().supSubComId(Integer.parseInt(params.getId())).canceled(0).build();

src/com/engine/organization/entity/chart/StatisticsVO.java

@@ -1,6 +1,5 @@
 package com.engine.organization.entity.chart;
 
-import com.icbc.api.internal.apache.http.impl.cookie.S;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/com/engine/organization/entity/company/bo/CompBO.java

@@ -24,7 +24,10 @@ public class CompBO {
     }
 
     public static List<SearchTree> buildSetToSearchTree(Set<CompPO> comps) {
-        return comps.stream().sorted(Comparator.comparing(item -> null == item.getShowOrder() ? 0 : item.getShowOrder())).map(item -> {
+        return comps.stream().sorted(Comparator
+                .comparingDouble(CompPO::getShowOrder)
+                .thenComparingDouble(CompPO::getShowOrderOfTree)
+        ).map(item -> {
             SearchTree tree = new SearchTree();
             tree.setCanClick(true);
             tree.setCanceled(item.getCanceled() != null && item.getCanceled() != 0);
@@ -33,10 +36,11 @@ public class CompBO {
             tree.setIsParent(false);
             tree.setIsVirtual("0");
             tree.setName(item.getSubCompanyName());
-            tree.setPid(item.getSupSubComId().toString());
+            tree.setPid(item.getSupSubComId() == null ? "0" :item.getSupSubComId().toString());
             tree.setSelected(false);
             tree.setType("1");
             tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
+            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0 : item.getShowOrderOfTree());
             return tree;
         }).collect(Collectors.toList());
     }
@@ -101,7 +105,7 @@ public class CompBO {
                         .subCompanyCode(e.getSubCompanyCode())
                         .subCompanyDesc(e.getSubCompanyDesc())
                         .subCompanyName(e.getSubCompanyName())
-                        .supSubComId(e.getSupSubComId())
+                        .supSubComId(e.getSupSubComId() == null ? 0 : e.getSupSubComId())
                         .supSubComName(null == poMaps.get(e.getSupSubComId()) ? "" : poMaps.get(e.getSupSubComId()).getSubCompanyName())
                         .showOrder(e.getShowOrder())
                         .canceled(null == e.getCanceled() ? 0 : e.getCanceled())

src/com/engine/organization/entity/company/dto/CompListDTO.java

@@ -59,7 +59,7 @@ public class CompListDTO {
 
 
     @TableTitle(labelId = 547185, title = "显示顺序", dataIndex = "showOrder", key = "showOrder", sorter = true)
-    private Integer showOrder;
+    private Double showOrder;
 
     /**
      * 禁用标记
@@ -78,8 +78,8 @@ public class CompListDTO {
      */
     private List<CompListDTO> children;
 
-    public Integer getShowOrder() {
+    public Double getShowOrder() {
-        return null == showOrder ? 0 : showOrder;
+        return null == showOrder ? 0.00 : showOrder;
     }
 
     private String orderType;
@@ -89,9 +89,9 @@ public class CompListDTO {
             return children;
         }
         if ("asc".equalsIgnoreCase(orderType)) {
-            return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList());
         } else {
-            return children.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
         }
     }
 }

src/com/engine/organization/entity/company/param/CompParam.java

@@ -25,6 +25,6 @@ public class CompParam extends BaseQueryParam {
     private String outKey;
     private Integer limitUsers;
     private String uuid;
-    private Integer showOrder;
+    private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 }

src/com/engine/organization/entity/company/po/CompPO.java

@@ -32,6 +32,20 @@ public class CompPO {
     private Date modified;
     private Integer modifier;
     private String uuid;
-    private Integer showOrder;
+    private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
+
+    public Double getShowOrder() {
+        if (null == showOrder) {
+            return 0.00;
+        }
+        return showOrder;
+    }
+
+    public Double getShowOrderOfTree() {
+        if (null == showOrderOfTree) {
+            return 0.00;
+        }
+        return showOrderOfTree;
+    }
 }

src/com/engine/organization/entity/department/bo/DepartmentBO.java

@@ -32,16 +32,20 @@ public class DepartmentBO {
      * @param list
      * @return
      */
-    public static List<DepartmentListDTO> buildDeptDTOShowNames(Collection<DepartmentListDTO> list) {
+    public static List<DepartmentListDTO> buildDeptDTOShowNames(List<DepartmentListDTO> list) {
-        return list.stream().peek(e -> {
+        setDeptLeader(list);
-                    List<DepartmentListDTO> children = e.getChildren();
+        return list;
-                    if (CollectionUtils.isNotEmpty(children)){
+    }
-                        List<DepartmentListDTO> collect = children.stream().peek(item -> item.setBmfzr(getEmployeeNameById(item.getId()))).collect(Collectors.toList());
+
-                        e.setChildren(collect);
+    public static void setDeptLeader(List<DepartmentListDTO> departments) {
-                    }
+        for (DepartmentListDTO dept : departments) {
-                    e.setBmfzr(getEmployeeNameById(e.getId()));
+            dept.setBmfzr(getEmployeeNameById(dept.getId()));
-                }
+            List<DepartmentListDTO> children = dept.getChildren();
-        ).collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(children)){
+                setDeptLeader(children);
+            }
+        }
+
     }
 
     public static List<DepartmentListDTO> buildDeptDTOList(Collection<DepartmentPO> list, String orderType) {
@@ -167,8 +171,9 @@ public class DepartmentBO {
             tree.setPid(null == item.getSupDepId() ? "0" : item.getSupDepId().toString());
             tree.setSelected(false);
             tree.setType("2");
-            tree.setParentComp(item.getSubCompanyId1().toString());
+            tree.setParentComp(null == item.getSubCompanyId1() ? "0" : item.getSubCompanyId1().toString());
-            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder().intValue());
+            tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder().intValue());
+            tree.setShowOrderOfTree(null == item.getShowOrderOfTree() ? 0.00 : item.getShowOrderOfTree());
             return tree;
         }).collect(Collectors.toList());
     }

src/com/engine/organization/entity/department/dto/DepartmentListDTO.java

@@ -36,7 +36,7 @@ public class DepartmentListDTO {
     /**
      * 名称
      */
-    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
+    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentMark", key = "departmentMark", width = "200")
     private String departmentMark;
 
     /**
@@ -48,7 +48,7 @@ public class DepartmentListDTO {
     /**
      * 简称
      */
-    @TableTitle(labelId = 547181, title = "简称", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547141, title = "名称", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**
@@ -105,9 +105,9 @@ public class DepartmentListDTO {
             return children;
         }
         if ("asc".equalsIgnoreCase(orderType)) {
-            return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
         } else {
-            return children.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+            return children.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
         }
     }
 }

src/com/engine/organization/entity/department/param/DeptSearchParam.java

@@ -28,5 +28,5 @@ public class DeptSearchParam extends BaseQueryParam {
 
     private String uuid;
     private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 }

src/com/engine/organization/entity/department/po/DepartmentPO.java

@@ -35,6 +35,6 @@ public class DepartmentPO {
     private Integer modifier;
     private String uuid;
     private Double showOrder;
-    private Integer showOrderOfTree;
+    private Double showOrderOfTree;
 
 }

src/com/engine/organization/entity/hrmresource/po/ResourcePO.java

@@ -27,7 +27,7 @@ public class ResourcePO {
     private Integer jobtitle;
 
     private String lastName;
-    private Integer dspOrder;
+    private Double dspOrder;
 
     /**
      * 临时关联聚才林岗位ID

src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java

@@ -33,7 +33,7 @@ import lombok.NoArgsConstructor;
                 " left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id" +
                 " left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID" +
                 " left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ",
-        orderby = " t.dsporder ",
+        orderby = " t.dsporder",
         sortway = " asc",
         primarykey = "id",
         operates = {

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -156,7 +156,7 @@ public class JobBO {
             tree.setSelected(false);
             tree.setType("3");
             tree.setParentComp(null == item.getEcDepartment() ? "0" : item.getEcDepartment().toString());
-            tree.setOrderNum(null == item.getShowOrder() ? 0 : item.getShowOrder());
+            tree.setOrderNum(null == item.getShowOrder() ? 0.00 : item.getShowOrder());
             return tree;
         }).collect(Collectors.toList());
 

src/com/engine/organization/entity/job/dto/JobListDTO.java

@@ -89,6 +89,8 @@ public class JobListDTO {
     //@TableTitle(title = "是否启用", dataIndex = "forbiddenTag", key = "forbiddenTag")
     //private Integer forbiddenTag;
 
+
+
     /**
      * 操作列
      */

src/com/engine/organization/entity/job/param/JobSearchParam.java

@@ -75,7 +75,7 @@ public class JobSearchParam extends BaseQueryParam {
     /**
      * 显示顺序
      */
-    private Integer showOrder;
+    private Double showOrder;
 
     private Integer subcompanyid1;
 

src/com/engine/organization/entity/job/po/JobPO.java

@@ -87,7 +87,7 @@ public class JobPO {
     /**
      * 显示顺序
      */
-    private Integer showOrder;
+    private Double showOrder;
 
     private String gradeId;
 

src/com/engine/organization/entity/searchtree/SearchTree.java

@@ -18,7 +18,8 @@ public class SearchTree extends TreeNode {
     private boolean isCanceled;
     private String requestParams;
     private String parentComp;
-    private Integer orderNum;
+    private Double orderNum;
+    private Double showOrderOfTree;
 
     public String getCompanyid() {
         return companyid;
@@ -76,14 +77,28 @@ public class SearchTree extends TreeNode {
         this.parentComp = parentComp;
     }
 
-    public Integer getOrderNum() {
+    public Double getOrderNum() {
+        if(null==orderNum){
+            return 0.00;
+        }
         return orderNum;
     }
 
-    public void setOrderNum(Integer orderNum) {
+    public void setOrderNum(Double orderNum) {
         this.orderNum = orderNum;
     }
 
+    public Double getShowOrderOfTree() {
+        if(null==showOrderOfTree){
+            return 0.00;
+        }
+        return showOrderOfTree;
+    }
+
+    public void setShowOrderOfTree(Double showOrderOfTree) {
+        this.showOrderOfTree = showOrderOfTree;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

src/com/engine/organization/mapper/department/DepartmentMapper.java

@@ -38,6 +38,14 @@ public interface DepartmentMapper {
      */
     List<DepartmentPO> listByFilter(@Param("departmentPO") DepartmentPO departmentPO, @Param("orderSql") String orderSql);
 
+    /**
+     * 根据搜索条件查询数据 保留封存（禁用）数据
+     * @param departmentPO
+     * @param orderSql
+     * @return
+     */
+    List<DepartmentPO> listByFilterAll(@Param("departmentPO") DepartmentPO departmentPO, @Param("orderSql") String orderSql);
+
     /**
      * 浏览按钮展示数据用
      *

src/com/engine/organization/mapper/department/DepartmentMapper.xml

@@ -12,6 +12,7 @@
         <result column="departmentCode" property="departmentCode"/>
         <result column="coadjutant" property="coadjutant"/>
         <result column="showOrder" property="showOrder"/>
+        <result column="showOrderOfTree" property="showOrderOfTree"/>
         <result column="uuid" property="uuid"/>
     </resultMap>
 
@@ -30,6 +31,7 @@
         t.departmentCode,
         t.coadjutant,
         t.showOrder,
+        t.showOrderOfTree,
         t.uuid
     </sql>
 
@@ -66,6 +68,26 @@
         order by ${orderSql}
     </select>
 
+    <select id="listByFilterAll" parameterType="com.engine.organization.entity.department.po.DepartmentPO"
+            resultMap="BaseResultMap">
+        select
+        <include refid="baseColumns"/>
+        from hrmdepartment t
+        where 1=1
+        <include refid="likeSQL"/>
+        <if test=" departmentPO.subCompanyId1 != null ">
+            and t.subCompanyId1 = #{departmentPO.subCompanyId1}
+        </if>
+        <if test=" departmentPO.supDepId != null ">
+            and t.supDepId = #{departmentPO.supDepId}
+        </if>
+        <if test=" departmentPO.departmentId != null ">
+            and t.id = #{departmentPO.departmentId}
+        </if>
+        <include refid="isCanceled"/>
+        order by ${orderSql}
+    </select>
+
     <select id="getDeptById" resultMap="BaseResultMap">
         select
         <include refid="baseColumns"/>
@@ -76,7 +98,7 @@
     <select id="listDeptsByIds" resultType="java.util.Map">
         select
         id as "id",
-        departmentName as "name"
+        departmentMark as "name"
         from hrmdepartment t
         WHERE id IN
         <foreach collection="ids" open="(" item="id" separator="," close=")">

src/com/engine/organization/mapper/job/JobMapper.java

@@ -130,7 +130,7 @@ public interface JobMapper {
      *
      * @return
      */
-    Integer getMaxShowOrder();
+    Double getMaxShowOrder();
 
     /**
      * 根据名字和上级查询岗位信息
@@ -141,7 +141,7 @@ public interface JobMapper {
      * @param parentJob
      * @return
      */
-    Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
+    List<JobPO> getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Integer parentCompany, @Param("parentDepartment") Integer parentDepartment, @Param("parentJob") Long parentJob,
                            @Param("jobactivitymark") String jobactivitymark,@Param("jobgroupremark") String jobgroupremark);
 
     int updateJobCompany(@Param("ids") Collection<Long> ids, @Param("parentCompany") Integer parentCompany, @Param("ecCompany") Integer ecCompany);

src/com/engine/organization/mapper/job/JobMapper.xml

@@ -467,7 +467,7 @@
             and t.forbidden_tag = #{jobPO.forbiddenTag}
         </if>
     </select>
-    <select id="getMaxShowOrder" resultType="java.lang.Integer">
+    <select id="getMaxShowOrder" resultType="java.lang.Double">
         select max(show_order)
         from jcl_org_job
     </select>
@@ -482,8 +482,10 @@
           and delete_type = 0
     </select>
 
-    <select id="getIdByNameAndPid" resultType="java.lang.Long">
+    <select id="getIdByNameAndPid" resultMap="BaseResultMap">
-        select t.id from jcl_org_job t
+        select
+        <include refid="baseColumns"/>
+        from jcl_org_job t
         left join hrmjobtitles h on t.ec_jobTitle = h.id
         left join hrmjobactivities j on h.jobactivityid = j.id
         left join hrmjobgroups f on j.jobgroupid = f.id

src/com/engine/organization/mapper/resource/HrmResourceMapper.xml

@@ -22,7 +22,7 @@
     <select id="selectFilterDatas" resultType="com.engine.organization.entity.hrmresource.po.ResourcePO">
         select distinct a.subcompanyid1, a.departmentid, a.jobtitle
         from hrmresource a
-        where a.status &lt; 4
+        where a.status &lt; 4 and a.seclevel &gt;= 0
           and not exists
             (select 1
              from jcl_org_job b

src/com/engine/organization/service/ChartService.java

@@ -100,7 +100,7 @@ public interface ChartService {
      * @param: []
      * @return: java.util.Map<java.lang.Integer,com.engine.organization.entity.chart.HrmLabelVO>
      */
-    Map<Integer, HrmLabelVO> selectLabel();
+    Map<String, HrmLabelVO> selectLabel();
 
     /**
      * @Description: 历史版本删除

src/com/engine/organization/service/impl/CardAccessServiceImpl.java

@@ -60,8 +60,9 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
     @Override
     public Map<String, Object> hasRight() {
         Map<String, Object> resultMap = new HashMap<>();
-        boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
+        //boolean hasRight = HasRightUtil.hasRight(user, RIGHT_NAME, true);
-        resultMap.put("hasRight", hasRight);
+        //脚本未找到该菜单 放开所有
+        resultMap.put("hasRight", true);
         return resultMap;
     }
 

src/com/engine/organization/service/impl/ChartServiceImpl.java

@@ -715,9 +715,9 @@ public class ChartServiceImpl extends Service implements ChartService {
     }
 
     @Override
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         RecordSet rs = new RecordSet();
-        Map<Integer, HrmLabelVO> labelData = new HashMap<>();
+        Map<String, HrmLabelVO> labelData = new HashMap<>();
         //labelId集合
         List<Integer> labelIds = Arrays.asList(547190,547194,547196,547262,547282,547283,547284,547285,547286,547287,547292,547293,547294,547296,547298,547299,547300,547301,547302,547303,547304,547305,547307,547310,547313,547314,547315,547316,547317,
                 547318,547319,547320,547321,547322,547323,547324,547326,547327,547328,547329,547330,547331,547332,547333,547334,547345,547346,547447,547448,547468,547473,547475,547476,547477,547478,547478,547264,547265,547463,547464,547465,
@@ -726,7 +726,7 @@ public class ChartServiceImpl extends Service implements ChartService {
         labelIds.forEach(item -> {
             rs.executeQuery("select labelName from HtmlLabelInfo where indexid = ? and languageid = ?",item,user.getLanguage());
             if (rs.next()){
-                labelData.put(item,HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
+                labelData.put(Util.null2String(item),HrmLabelVO.builder().labelName(Util.null2String(rs.getString("labelName"))).build());
             }
 
         });
@@ -1007,7 +1007,7 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=1 ";
             deptQuerySql = "select a.id as departmentid, a.departmentmark, a.departmentname, a.subcompanyid1  as subcompanyid, " +
                     "b.SUBCOMPANYNAME as subcompany,a.supdepid as supdepartmentid,c.departmentname as supdepartment," +
-                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,a.bmfzr as fleader,e.on_job_num,e.staff_num " +
+                    "a.canceled,a.departmentcode,a.coadjutant,a.tlevel,d.bmlx as isvirtual,d.bmfzr as fleader,e.on_job_num,e.staff_num " +
                     "from hrmdepartment a left join hrmsubcompany b on a.subcompanyid1 = b.id " +
                     "left join hrmdepartment c on a.supdepid = c.id " +
                     "left join hrmdepartmentdefined d on a.id=d.deptid " +
@@ -1040,12 +1040,13 @@ public class ChartServiceImpl extends Service implements ChartService {
                     "               a.departmentcode,\n" +
                     "               a.coadjutant,\n" +
                     "               a.tlevel,\n" +
-                    "               a.bmfzr          as fleader,\n" +
+                    "               e.bmfzr          as fleader,\n" +
                     "               d.on_job_num,\n" +
                     "               d.staff_num" +
                     "        from hrmdepartment a\n" +
                     "                 left join hrmsubcompany b on a.subcompanyid1 = b.id\n" +
                     "                 left join hrmdepartment c on a.supdepid = c.id\n" +
+                    "                 left join hrmdepartmentdefined e on a.id=e.deptid\n" +
                     "                 left join JCL_ORG_ONJOB d on a.id=d.data_id and d.type=2 ";
         }
 
@@ -1671,9 +1672,6 @@ public class ChartServiceImpl extends Service implements ChartService {
      * @return 人员名称
      */
     private String getDepartmentLeader(String ids) {
-        if (!isRealTime) {
-            return ids;
-        }
         if (StringUtils.isBlank(ids)) {
             return "";
         }

src/com/engine/organization/service/impl/CompServiceImpl.java

@@ -85,10 +85,10 @@ public class CompServiceImpl extends Service implements CompService {
             // 添加父级元素
             List<CompListDTO> compListDTOS = CompBO.buildCompDTOList(allList, filterCompPOs, orderType.toString());
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder)).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(CompListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<CompListDTO> subList = PageUtil.subList(params.getCurrent(), params.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(user, subList, CompListDTO.class);

src/com/engine/organization/service/impl/ConfigServiceImpl.java

@@ -48,7 +48,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
     public String ssoLogin(QTXConfigParam qtx) throws UnsupportedEncodingException {
         String hkUrl;
         BaseBean bb = new BaseBean();
-        String enable = bb.getPropValue("qtx_sso_login", "enable");
+        String enable = bb.getPropValue("hrmOrganization", "enable");
         String userAgent = qtx.getUserAgent();
         boolean termianal = MobileTerminalEnum.containsEnumValue(userAgent);
         if (VALUE_ONE.equals(enable)) {
@@ -83,7 +83,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
         if (Objects.nonNull(qtxConfigPO)) {
             BeanUtils.copyProperties(datas, qtxConfigPO);
         }
-        map.put("isopenconfig",bb.getPropValue("qtx_sso_login","enable"));
+        map.put("isopenconfig",bb.getPropValue("hrmOrganization","enable"));
         map.put("columns",columns);
         map.put("datas", Collections.singletonList(datas));
         return map;
@@ -93,7 +93,7 @@ public class ConfigServiceImpl extends Service implements ConfigService {
     @Override
     public int saveConfigInfo(QTXConfigPO qtxConfigPO, String isopenconfig) {
         ConfigOperator ConfigOperator = new ConfigOperator();
-        ConfigOperator.setProp("qtx_sso_login.properties", "enable", isopenconfig);
+        ConfigOperator.setProp("hrmOrganization.properties", "enable", isopenconfig);
         qtxConfigPO.setCreator(user.getUID());
         qtxConfigPO.setCreateDate(OrganizationDateUtil.getFormatLocalDate(LocalDate.now()));
         getConfigMapper().deleteAll();

src/com/engine/organization/service/impl/DepartmentServiceImpl.java

@@ -129,15 +129,15 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         // 通过子级遍历父级元素
         if (filter) {
             // 根据条件获取元素
-            List<DepartmentPO> filterDeptPOs = getDepartmentMapper().listByFilter(departmentPO, orderSql);
+            List<DepartmentPO> filterDeptPOs = getDepartmentMapper().listByFilterAll(departmentPO, orderSql);
             new DetachUtil(user).filterDepartmentList(filterDeptPOs);
             // 添加父级元素
             List<DepartmentListDTO> compListDTOS = DepartmentBO.buildDeptDTOList(allList, filterDeptPOs, orderType.toString());
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                compListDTOS = compListDTOS.stream().sorted(Comparator.comparing(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                compListDTOS = compListDTOS.stream().sorted(Comparator.comparingDouble(DepartmentListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<DepartmentListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), compListDTOS);
             pageInfos = new PageInfo<>(user, DepartmentBO.buildDeptDTOShowNames(subList), DepartmentListDTO.class);

src/com/engine/organization/service/impl/ExportCommonServiceImpl.java

@@ -15,7 +15,6 @@ import com.engine.organization.entity.department.bo.DepartmentBO;
 import com.engine.organization.entity.department.dto.DepartmentListDTO;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO;
-import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
 import com.engine.organization.entity.staff.po.StaffPO;
 import com.engine.organization.entity.staff.vo.StaffTableVO;
@@ -36,6 +35,7 @@ import com.engine.organization.util.detach.DetachUtil;
 import com.engine.organization.util.excel.ExcelUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import weaver.general.BaseBean;
 import weaver.general.Util;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
@@ -44,7 +44,6 @@ import weaver.systeminfo.SystemEnv;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -167,7 +166,8 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
         }
 
         List<String> columnList = Arrays.asList(columns.split(","));
-
+        String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId");
+        Map<String, WeaTableColumn> columnMap = new HashMap<>();
 
 
         BigDecimal decimal = new BigDecimal(100 / columnList.size());
@@ -175,25 +175,40 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
             List<SearchConditionItem> items = allCondition.getItems();
             for (SearchConditionItem item : items) {
                 String columnName = item.getDomkey()[0];
-                fields.add(hrmResourceService.buildTableSql(columnName) + " as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
+                WeaTableColumn weaTableColumn = new WeaTableColumn();
+
+                if (columnName.equals("-1_cus_"+propValue)){
+                    fields.add("t.id as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
+                    weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValueExp");
+                }else{
+                    fields.add(hrmResourceService.buildTableSql(columnName) + " as " + hrmResourceService.buildTableSql(columnName).replace(".", "_"));
+                    // 导出专用转换，去除html标签
+                    weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValueExp");
+                }
+
 
                 String scopeId = columnName.split("_")[0];
                 String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
-                WeaTableColumn weaTableColumn = new WeaTableColumn();
                 weaTableColumn.setText(MapperProxyFactory.getProxy(HrmResourceMapper.class).queryLabelName(fieldName, scopeId, user.getLanguage()));
                 weaTableColumn.setColumn(hrmResourceService.buildTableSql(columnName).replace(".", "_"));
                 weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
-                // 导出专用转换，去除html标签
+
-                weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValueExp");
                 weaTableColumn.setOtherpara(columnName);
-                weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
+                //weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
-                if (weaTableColumn.getDisplay().getBoolVal()) {
+                columnMap.put(columnName, weaTableColumn);
-                    weaTableColumnList.add(weaTableColumn);
+            }
-                    headerList.add(weaTableColumn.getColumn());
+        }
-                    headerNameList.add(weaTableColumn.getText());
+
-                }
+        for (String columnName : columnList) {
+            WeaTableColumn weaTableColumn = columnMap.get(columnName);
+            if (weaTableColumn != null && weaTableColumn.getDisplay().getBoolVal()) {
+                weaTableColumnList.add(weaTableColumn);
+                headerList.add(weaTableColumn.getColumn());
+                headerNameList.add(weaTableColumn.getText());
             }
         }
+
+
         // 增加id字段,跳转人员卡片
         WeaTableColumn weaTableColumn = new WeaTableColumn();
         weaTableColumn.setColumn("id");

src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java

@@ -1,5 +1,6 @@
 package com.engine.organization.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.engine.organization.entity.staff.param.StaffOutParam;
 import com.engine.organization.entity.staff.po.StaffPO;
 import com.engine.organization.enums.ModuleTypeEnum;
@@ -9,6 +10,7 @@ import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import lombok.SneakyThrows;
 import org.apache.commons.collections.CollectionUtils;
+import weaver.general.BaseBean;
 import weaver.hrm.User;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
@@ -75,7 +77,11 @@ public class FunctionOutStaffServiceImpl {
 
     private Integer frozenStaffNums(StaffOutParam param) {
         StaffPO staffPO = select(param);
-        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
+        if (param.getNum() < 0) {
+            OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
+        }
+
+        List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
@@ -107,14 +113,14 @@ public class FunctionOutStaffServiceImpl {
         }
         //向上部门 分部在编数调整
         upwardReviewSums(param);
-        //2.调整方式为流程时释放冻结数
+        //2.调整方式为流程时释放冻结数（废弃 单独走冻结接口释放）
-        if (param.getChangeMode() == 1) {
+//        if (param.getChangeMode() == 1) {
-            List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
+//            List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
-            int difference = numbersF.stream()
+//            int difference = numbersF.stream()
-                    .reduce((a, b) -> a - b)
+//                    .reduce((a, b) -> a - b)
-                    .orElse(0);
+//                    .orElse(0);
-            staffPO.setFreezeNum(difference);
+//            staffPO.setFreezeNum(difference);
-        }
+//        }
         buildStaffPO(staffPO);
         return staffMapper().updateStaff(staffPO);
     }
@@ -130,13 +136,13 @@ public class FunctionOutStaffServiceImpl {
         //向上部门 分部在编数调整
         upwardReviewSums(param);
         //2.调整方式为流程时释放冻结数
-        if (param.getChangeMode() == 1) {
+//        if (param.getChangeMode() == 1) {
-            List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
+//            List<Integer> numbersF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
-            int differenceF = numbersF.stream()
+//            int differenceF = numbersF.stream()
-                    .reduce((a, b) -> a - b)
+//                    .reduce((a, b) -> a - b)
-                    .orElse(0);
+//                    .orElse(0);
-            staffPO.setFreezeNum(differenceF);
+//            staffPO.setFreezeNum(differenceF);
-        }
+//        }
         buildStaffPO(staffPO);
         return staffMapper().updateStaff(staffPO);
     }
@@ -223,6 +229,10 @@ public class FunctionOutStaffServiceImpl {
 
     private  StaffPO select(StaffOutParam param) {
         List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob());
+        BaseBean bb = new BaseBean();
+        bb.writeLog("编制参数"+ JSON.toJSONString(param));
+        bb.writeLog("查询结果"+ JSON.toJSONString(staffPO));
+        bb.writeLog("user对象"+JSON.toJSONString(user));
         OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         return staffPO.get(0);
     }

src/com/engine/organization/service/impl/HrmResourceServiceImpl.java

@@ -59,10 +59,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import weaver.common.DateUtil;
 import weaver.conn.RecordSet;
+import weaver.general.BaseBean;
 import weaver.general.StringUtil;
 import weaver.general.TimeUtil;
 import weaver.general.Util;
+import weaver.hrm.company.DepartmentComInfo;
+import weaver.hrm.company.SubCompanyComInfo;
 import weaver.hrm.definedfield.HrmFieldManager;
+import weaver.hrm.privacy.PrivacyComInfo;
 import weaver.systeminfo.SystemEnv;
 
 import java.math.BigDecimal;
@@ -160,6 +164,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<String> fields = new ArrayList<>();
         List<SearchConditionGroup> allConditions = getAllConditions();
 
+        String propValue = new BaseBean().getPropValue("hrmOrganization", "orgId");
+
         if (jclOrgCustomTemplatePO != null) {
             if (StringUtils.isNotBlank(jclOrgCustomTemplatePO.getBasicFields())) {
                 columns = jclOrgCustomTemplatePO.getBasicFields();
@@ -183,19 +189,41 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
         }
         List<SearchConditionItem> items = filterByDomkey(all, columnList);
+        List<String> privacyList = Arrays.asList("-1_hrm_mobile","-1_hrm_telephone","-1_hrm_mobilecall","-1_hrm_fax","-1_hrm_email");
         for (SearchConditionItem item : items) {
             String columnName = item.getDomkey()[0];
-            fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
+            WeaTableColumn weaTableColumn = new WeaTableColumn();
+
+            if (columnName.equals("-1_cus_"+propValue)){
+                weaTableColumn.setOtherpara(columnName);
+                fields.add("t.id as " + buildTableSql(columnName).replace(".", "_"));
+                weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getOrgValue");
+            }else if(privacyList.contains(columnName)) {
+                fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
+                PrivacyComInfo pc = new PrivacyComInfo();
+                Map<String, String> mapShowSets = pc.getMapShowSets();
+                String[] parts = columnName.split("_");
+                String fieldName = parts[parts.length - 1];
+                if (mapShowSets != null && mapShowSets.get("mobile") != null) {
+                    weaTableColumn.setOtherpara("column:id+" + user.getUID() + "+"+fieldName+"");
+                    weaTableColumn.setTransmethod("weaver.hrm.privacy.PrivacyComInfo.getSearchContent");
+                }else {
+                    weaTableColumn.setOtherpara(fieldName+":"+user.getLanguage());
+                    weaTableColumn.setTransmethod("weaver.hrm.HrmTransMethod.getDefineContent");
+                }
 
+            } else{
+                weaTableColumn.setOtherpara(columnName);
+                fields.add(buildTableSql(columnName) + " as " + buildTableSql(columnName).replace(".", "_"));
+                weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
+            }
             String scopeId = columnName.split("_")[0];
             String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
-            WeaTableColumn weaTableColumn = new WeaTableColumn();
+
             weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId, user.getLanguage()));
             weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
 
             weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
-            weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
-            weaTableColumn.setOtherpara(columnName);
             weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
             weaTableColumnList.add(weaTableColumn);
         }
@@ -205,6 +233,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         weaTableColumn.setColumn("id");
         weaTableColumn.setDisplay(WeaBoolAttr.FALSE);
 
+
         weaTableColumnList.add(weaTableColumn);
         fields.add("t.id");
         table.setBackfields(StringUtils.join(fields, ","));
@@ -296,7 +325,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<String> selectKeys;
         if ("custom".equals(type)) {
             if ("-1".equals(templateId)) {
-                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
+                //selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid".split(","));
+                selectKeys = Arrays.asList("-1_hrm_lastname,-1_hrm_departmentid,-1_hrm_subcompanyid1,-1_hrm_jobtitle,-1_hrm_mobile,-1_hrm_telephone,-1_hrm_managerid,-1_hrm_sporder".split(","));
             } else {
                 searchTemplateById = getHrmResourceMapper().getCustomTemplateById(templateId);
                 selectKeys = getSelectKeys(searchTemplateById);
@@ -592,7 +622,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         }
         Map<String, Object> apiDatas = new HashMap<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
-        List<SearchConditionGroup> allConditions = getAllConditions();
+        List<SearchConditionGroup> allConditions = getAllConditions(true);
         // 穿梭框ID，展示所选字段信息
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         if ("-1".equals(templateId)) {
@@ -632,6 +662,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
         btnDatas.put("loginId", user.getUID());
+        btnDatas.put("cardType", new BaseBean().getPropValue("hrmOrganization", "cardType"));
         //获取当前用户使用的列定制模板Id
         btnDatas.put("customTemplateId", getCustomTemplateId());
         btnDatas.put("searchTemplateId", getSearchTemplateId());
@@ -774,13 +805,25 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, conditionItems);
         Map<String, SearchConditionItem> allFieldsMap = conditionItems.stream().collect(Collectors.toMap(item -> item.getDomkey()[0], item -> item, (k1, k2) -> k1));
         boolean isQuickSearch = "true".equals(Util.null2String(params.get("isQuickSearch")));
+        DepartmentComInfo deptInfo = new DepartmentComInfo();
+        SubCompanyComInfo subInfo = new SubCompanyComInfo();
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
         StringBuilder sb = new StringBuilder(" where 1=1 ");
+        // 默认去除外部人员显示
+        sb.append( " and t.seclevel >= 0 ");
+
         if (params.containsKey("lastName") || !params.containsKey("-1_hrm_status")) {
             // sb.append(" and t.status = 1");
             sb.append(" and t.status < 4");
         }
+        if (params.containsKey("-1_hrm_subcompanyid1")) {
+            String value = Util.null2String(params.get("-1_hrm_subcompanyid1"));
+            if (StringUtils.isNotBlank(value)) {
+                sb.append(" and t.subcompanyid1 in(").append(value).append(")");
+            }
+            params.remove("-1_hrm_subcompanyid1");
+        }
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String key = entry.getKey();
             String value = Util.null2String(entry.getValue());
@@ -791,10 +834,18 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                 sb.append(" and t.lastname ").append(dbType.like(value));
             }
             if ("companyId".equals(key)) {
-                sb.append(" and t.subcompanyid1 ='").append(value).append("'");
+                ArrayList<Integer> list = new ArrayList<>();
+                list.add(Integer.parseInt(value));
+                subInfo.getSubCompanyLists(value,list);
+                String allSub = StringUtils.join(list,",");
+                sb.append(" and t.subcompanyid1 in(").append(allSub).append(")");
             }
             if ("departmentId".equals(key)) {
-                sb.append(" and t.departmentId ='").append(value).append("'");
+                ArrayList<Integer> list = new ArrayList<>();
+                list.add(Integer.parseInt(value));
+                deptInfo.getAllChildDeptByDepId(list,value);
+                String allDept = StringUtils.join(list,",");
+                sb.append(" and t.departmentId in (").append(allDept).append(")");
             }
             if ("jobTitle".equals(key)) {
                 JobPO jobById = getJobMapper().getJobById(Long.parseLong(value));
@@ -983,12 +1034,15 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     }
 
 
+    public List<SearchConditionGroup> getAllConditions() {
+        return getAllConditions(false);
+    }
     /**
      * 获取所有搜索字段信息构建的高级搜索表单
      *
      * @return
      */
-    public List<SearchConditionGroup> getAllConditions() {
+    public List<SearchConditionGroup> getAllConditions(boolean isSearch) {
         HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo = new HrmFieldSearchConditionComInfo();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> basicConditionItems = new ArrayList<>();
@@ -999,6 +1053,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         List<CusFormFieldPO> hrmFieldsByScopeId = getSystemDataMapper().getHrmFieldsByScopeId(HrmGroupEnum.HRM_BASIC.getGroupType().toString());
         createConditionItems(hrmFieldSearchConditionComInfo, hrmFieldsByScopeId, basicConditionItems);
         if (CollectionUtils.isNotEmpty(basicConditionItems)) {
+            SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,isSearch);
+            basicConditionItems.add(0,searchConditionItem);
             addGroups.add(new SearchConditionGroup(SystemEnv.getHtmlLabelName(547175, user.getLanguage()), true, basicConditionItems));
         }
 
@@ -1018,6 +1074,34 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return addGroups;
     }
 
+
+    /**
+     * 花名册构建
+     *
+     * @param hrmFieldSearchConditionComInfo
+     * @param isSearch
+     * @return
+     */
+    private SearchConditionItem buildSubCompanyCondition(HrmFieldSearchConditionComInfo hrmFieldSearchConditionComInfo, boolean isSearch) {
+        HrmFieldBean hrmFieldBean = new HrmFieldBean();
+        hrmFieldBean.setFieldid("");
+        hrmFieldBean.setFieldname("-1_hrm_subcompanyid1");
+        hrmFieldBean.setFieldlabel("-2458");
+        hrmFieldBean.setFieldhtmltype("3");
+        if (isSearch) {
+            hrmFieldBean.setType("170");
+        } else {
+            hrmFieldBean.setType("164");
+        }
+        hrmFieldBean.setIsQuickSearch(false);
+        hrmFieldBean.setIsScope(false);
+        hrmFieldBean.setDmlurl("");
+        hrmFieldBean.setIssystem("1");
+        hrmFieldBean.setIsFormField(true);
+        SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
+        return searchConditionItem;
+    }
+
     /**
      * 构建查询条件Item
      *
@@ -1070,32 +1154,37 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", scopeid);
             List<SearchConditionItem> conditionItems = new ArrayList<>();
             for (String field : fieldNames) {
-                String fieldName = field.substring(field.lastIndexOf("_") + 1);
+                if ("-1_hrm_subcompanyid1".equals(field)) {
-                JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
+                    SearchConditionItem searchConditionItem = buildSubCompanyCondition(hrmFieldSearchConditionComInfo,true);
-                if (null == hrmFieldConf) {
+                    conditionItems.add(searchConditionItem);
-                    continue;
+                } else {
-                }
+                    String fieldName = field.substring(field.lastIndexOf("_") + 1);
-                boolean baseField = hfm.isBaseField(fieldName);
+                    JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
-                HrmFieldBean hrmFieldBean = new HrmFieldBean();
+                    if (null == hrmFieldConf) {
-                hrmFieldBean.setFieldid(Util.null2String(hrmFieldConf.getString("id")));
+                        continue;
-                hrmFieldBean.setFieldname(scopeid + "_" + (baseField ? "hrm" : "cus") + "_" + fieldName);
+                    }
-                hrmFieldBean.setFieldlabel(hrmFieldConf.getString("fieldlabel"));
+                    boolean baseField = hfm.isBaseField(fieldName);
-                hrmFieldBean.setFieldhtmltype(hrmFieldConf.getString("fieldhtmltype"));
+                    HrmFieldBean hrmFieldBean = new HrmFieldBean();
-                hrmFieldBean.setType(hrmFieldConf.getString("type"));
+                    hrmFieldBean.setFieldid(Util.null2String(hrmFieldConf.getString("id")));
-                hrmFieldBean.setDmlurl(hrmFieldConf.getString("dmlurl"));
+                    hrmFieldBean.setFieldname(scopeid + "_" + (baseField ? "hrm" : "cus") + "_" + fieldName);
-                hrmFieldBean.setIssystem(baseField ? "1" : "0");
+                    hrmFieldBean.setFieldlabel(hrmFieldConf.getString("fieldlabel"));
-                hrmFieldBean.setIsFormField(true);
+                    hrmFieldBean.setFieldhtmltype(hrmFieldConf.getString("fieldhtmltype"));
-                hrmFieldBean.setIsQuickSearch(false);
+                    hrmFieldBean.setType(hrmFieldConf.getString("type"));
-                hrmFieldBean.setIsScope(false);
+                    hrmFieldBean.setDmlurl(hrmFieldConf.getString("dmlurl"));
-                if ("jobactivity".equals(fieldName)) {
+                    hrmFieldBean.setIssystem(baseField ? "1" : "0");
-                    // 职务：282
+                    hrmFieldBean.setIsFormField(true);
-                    hrmFieldBean.setType("282");
+                    hrmFieldBean.setIsQuickSearch(false);
-                }
+                    hrmFieldBean.setIsScope(false);
-                SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
+                    if ("jobactivity".equals(fieldName)) {
-                conditionItems.add(searchConditionItem);
+                        // 职务：282
-                // 如果为下拉框,添加一条空选项
+                        hrmFieldBean.setType("282");
-                if (searchConditionItem.getConditionType().equals(ConditionType.SELECT)) {
+                    }
-                    addEmptyForSelect(searchConditionItem);
+                    SearchConditionItem searchConditionItem = hrmFieldSearchConditionComInfo.getSearchConditionItem(hrmFieldBean, user);
+                    conditionItems.add(searchConditionItem);
+                    // 如果为下拉框,添加一条空选项
+                    if (searchConditionItem.getConditionType().equals(ConditionType.SELECT)) {
+                        addEmptyForSelect(searchConditionItem);
+                    }
                 }
             }
             if (CollectionUtils.isNotEmpty(conditionItems)) {
@@ -1224,7 +1313,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
             case BROWSER://浏览按钮
                 // 兼容多选浏览按钮
-                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
+                sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like("," + value + ","));
                 break;
 
             case INPUTNUMBER:// 数字

src/com/engine/organization/service/impl/JobServiceImpl.java

@@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
 import weaver.general.StringUtil;
 import weaver.general.Util;
 import weaver.hrm.User;
+import weaver.hrm.job.JobTitlesComInfo;
 import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
@@ -163,10 +164,10 @@ public class JobServiceImpl extends Service implements JobService {
             // 添加父级元素
             List<JobListDTO> jobListDTOS = JobBO.buildJobDTOList(allList, filterJobPOs);
             if ("asc".equalsIgnoreCase(orderType.toString())) {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder)).collect(Collectors.toList());
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder)).collect(Collectors.toList());
 
             } else {
-                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparing(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
+                jobListDTOS = jobListDTOS.stream().sorted(Comparator.comparingDouble(JobListDTO::getShowOrder).reversed()).collect(Collectors.toList());
             }
             List<JobListDTO> subList = PageUtil.subList(param.getCurrent(), param.getPageSize(), jobListDTOS);
             pageInfos = new PageInfo<>(user, subList, JobListDTO.class);
@@ -366,9 +367,9 @@ public class JobServiceImpl extends Service implements JobService {
         }
 
         if (StringUtils.isBlank(params.get("show_order").toString())) {
-            Integer maxShowOrder = getJobMapper().getMaxShowOrder();
+            Double maxShowOrder = getJobMapper().getMaxShowOrder();
             if (null == maxShowOrder) {
-                maxShowOrder = 0;
+                maxShowOrder = 0.00;
             }
             params.put("show_order", maxShowOrder + 1);
         }
@@ -379,7 +380,7 @@ public class JobServiceImpl extends Service implements JobService {
 
         String jobNo = (String) params.get("job_no");
         // 判断是否开启自动编号
-        jobNo = repeatDetermine(jobNo);
+        jobNo = repeatDetermine(jobNo,searchParam.getEcJobTitle(),searchParam.getEcDepartment());
         params.put("job_no", jobNo);
         return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
     }
@@ -400,7 +401,7 @@ public class JobServiceImpl extends Service implements JobService {
             String oldJobNo = oldJobPO.getJobNo();
             String jobNo = searchParam.getJobNo();
             if (!jobNo.equals(oldJobNo)) {
-                jobNo = repeatDetermine(jobNo);
+                jobNo = repeatDetermine(jobNo,searchParam.getEcJobTitle(),searchParam.getEcDepartment());
                 params.put("job_no", jobNo);
             }
 
@@ -432,8 +433,8 @@ public class JobServiceImpl extends Service implements JobService {
         OrganizationAssert.notBlank(department, SystemEnv.getHtmlLabelName(547423,user.getLanguage()));
         int insertCount = 0;
         List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-        Integer orderNum = getJobMapper().getMaxShowOrder();
+        Double orderNum = getJobMapper().getMaxShowOrder();
-        orderNum = null == orderNum ? 0 : orderNum;
+        orderNum = null == orderNum ? 0.00 : orderNum;
         for (Long id : idList) {
             orderNum++;
             JobPO jobById = getJobMapper().getJobById(id);
@@ -565,6 +566,7 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public void refresh() {
+        JobTitlesComInfo jb = new JobTitlesComInfo();
         // 解决并发情况下，岗位数据重复问题
         synchronized (JobServiceImpl.class) {
             //1.人员表查询
@@ -582,6 +584,10 @@ public class JobServiceImpl extends Service implements JobService {
                             .createTime(new Date())
                             .updateTime(new Date())
                             .build();
+                    String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePO.getJobtitle()));
+                    if (!"".equals(jobTitlescode)) {
+                        jobPO.setJobNo(jobTitlescode+"-"+resourcePO.getDepartmentid());
+                    }
                     getJobMapper().insertIgnoreNull(jobPO);
                 }
             });
@@ -733,7 +739,8 @@ public class JobServiceImpl extends Service implements JobService {
      *
      * @return
      */
-    public String repeatDetermine(String jobNo) {
+    public String repeatDetermine(String jobNo,Integer jobTitle,Integer departmentId) {
+        JobTitlesComInfo jb = new JobTitlesComInfo();
         CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(RuleCodeType.JOBTITLES.getValue());
         if (StringUtils.isNotBlank(jobNo)) {
             jobNo = CodeRuleUtil.generateCode(RuleCodeType.JOBTITLES, jobNo);
@@ -742,7 +749,11 @@ public class JobServiceImpl extends Service implements JobService {
             OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         } else {
             //OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
-            jobNo = autoCreateCompanyNo();
+            //jobNo = autoCreateCompanyNo();
+            String jobTitlescode = jb.getJobTitlescode(String.valueOf(jobTitle));
+            if (!"".equals(jobTitlescode)) {
+                jobNo = jobTitlescode+"-"+departmentId;
+            }
         }
         return jobNo;
     }

src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java

@@ -27,8 +27,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
 import weaver.general.Util;
-import weaver.hrm.cachecenter.bean.RolemembersComInfo;
-import weaver.hrm.resource.ResourceComInfo;
 import weaver.hrm.roles.RolesComInfo;
 import weaver.systeminfo.SystemEnv;
 
@@ -233,7 +231,7 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         }
         String ecRolelevel = (String) params.get("ecRolelevel");
         if (StringUtils.isNotBlank(ecRolelevel)) {
-            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like(ecRolelevel);
+            sqlWhere += " AND " + dbType.concat("ec_rolelevel") + dbType.like("," + ecRolelevel + ",");
         }
         return sqlWhere;
     }

src/com/engine/organization/service/impl/OrgChartServiceImpl.java

@@ -611,9 +611,15 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         Map<String, Object> datas = new HashMap<>();
         RecordSet rs = new RecordSet();
         String fclass = Util.null2String(params.get("fclass"));
+        String timeName = Util.null2String(params.get("timeName"));
         List<TimeLinesBO> timeLinesBOList = new ArrayList<>();
         timeLinesBOList.add(TimeLinesBO.builder().key(0).id(0).title("当前版本").color("blue").time("").build());
-        rs.executeQuery("SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ? order by id desc", fclass, 0);
+        String sql = "SELECT id,recorddate,description from JCL_ORG_CHARTVERSION where fclass = ? and deletetype = ?";
+        if (StringUtils.isNotEmpty(timeName)) {
+            sql += " and description like '%"+timeName+"%'";
+        }
+        sql += " order by id desc";
+        rs.executeQuery(sql, fclass, 0);
         while (rs.next()) {
             timeLinesBOList.add(TimeLinesBO.builder()
                     .key(rs.getInt("id"))

src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java

@@ -845,7 +845,7 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
             jobPO.setDescription(description);
             jobPO.setWorkDuty(work_duty);
             jobPO.setWorkAuthority(work_authority);
-            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Integer.parseInt(show_order));
+            jobPO.setShowOrder(StringUtils.isBlank(show_order) ? null : Double.parseDouble(show_order));
             jobPO.setForbiddenTag(StringUtils.isBlank(forbidden_tag) ? null : Integer.parseInt(forbidden_tag));
             jobPO.setGradeId(grade_id);
             jobPO.setLevelId(level_id);

src/com/engine/organization/transmethod/HrmResourceTransMethod.java

@@ -1,5 +1,6 @@
 package com.engine.organization.transmethod;
 
+import com.api.hrm.util.HrmTransMethod;
 import com.engine.organization.entity.job.bo.JobBO;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
@@ -8,6 +9,7 @@ import com.engine.organization.util.db.MapperProxyFactory;
 import org.json.JSONObject;
 import weaver.hrm.User;
 import weaver.hrm.definedfield.HrmFieldManager;
+import weaver.hrm.resource.ResourceComInfo;
 
 /**
  * @author:dxfeng
@@ -25,6 +27,9 @@ public class HrmResourceTransMethod {
      */
     public static String getFieldTrueValue(String id, String para) {
         HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
+        if("-1_hrm_subcompanyid1".equals(para)){
+            hfm = new HrmFieldManager("HrmCustomFieldByInfoType", 5);
+        }
         String fieldName = para.substring(para.lastIndexOf("_") + 1);
         JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
         User user = new User();
@@ -39,6 +44,34 @@ public class HrmResourceTransMethod {
         }
     }
 
+    public static String getOrgValue(String id, String para) {
+        HrmTransMethod hrmTransMethod = new HrmTransMethod();
+
+        try {
+            ResourceComInfo hrm = new ResourceComInfo();
+            String departmentId = hrm.getDepartmentID(id);
+            String subCompanyId = hrm.getSubCompanyID(id);
+            return  hrmTransMethod.getAllParentDepartmentNames("",departmentId,subCompanyId);
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
+    public static String getOrgValueExp(String id, String para) {
+        HrmTransMethod hrmTransMethod = new HrmTransMethod();
+
+        try {
+            ResourceComInfo hrm = new ResourceComInfo();
+            String departmentId = hrm.getDepartmentID(id);
+            String subCompanyId = hrm.getSubCompanyID(id);
+            String allParentDepartmentNames = hrmTransMethod.getAllParentDepartmentNames("", departmentId, subCompanyId);
+            allParentDepartmentNames = allParentDepartmentNames.replaceAll("<[^>]*>", "").replaceAll("&nbsp", "");
+            return allParentDepartmentNames;
+        } catch (Exception e) {
+            return "";
+        }
+    }
+
     /**
      * 字段展示内容转换，导出用
      *
@@ -48,6 +81,9 @@ public class HrmResourceTransMethod {
      */
     public static String getFieldTrueValueExp(String id, String para) {
         HrmFieldManager hfm = new HrmFieldManager("HrmCustomFieldByInfoType", Integer.parseInt(para.split("_")[0]));
+        if("-1_hrm_subcompanyid1".equals(para)){
+            hfm = new HrmFieldManager("HrmCustomFieldByInfoType", 5);
+        }
         String fieldName = para.substring(para.lastIndexOf("_") + 1);
         JSONObject hrmFieldConf = hfm.getHrmFieldConf(fieldName);
         User user = new User();

src/com/engine/organization/util/saveimport/StaffInfoImportUtil.java

@@ -222,14 +222,22 @@ public class StaffInfoImportUtil {
                                 continue nextRow;
                             }
                             for (String s : split) {
-                                parentJobId = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
+                                List<JobPO> jobPList = MapperProxyFactory.getProxy(JobMapper.class).getIdByNameAndPid(s, parentCompanyId, parentDepartmentId == null ? 0 : parentDepartmentId, parentJobId == null ? 0 : parentJobId
                                 ,jobactivitymark,jobgroupremark);
-                                if (null == parentJobId) {
+                                if (jobPList.size() > 1) {
+                                    historyDetailPO.setOperateDetail(s + "岗位在岗位管理中存在重复数据，请先处理");
+                                    historyDetailPO.setStatus("0");
+                                    OrgImportUtil.saveImportDetailLog(historyDetailPO);
+                                    continue nextRow;
+                                }
+                                if (jobPList.size() == 0) {
                                     historyDetailPO.setOperateDetail(s + "岗位未找到对应数据");
                                     historyDetailPO.setStatus("0");
                                     OrgImportUtil.saveImportDetailLog(historyDetailPO);
                                     continue nextRow;
                                 }
+                                parentJobId = jobPList.get(0).getId();
+
                             }
                         }
                         map.put("job_id", parentJobId);
@@ -286,7 +294,7 @@ public class StaffInfoImportUtil {
                     break;
                 case "3": // 岗位
                     if (null == parentJobId) {
-                        checkMsg = "编制维度选择岗位时，岗位必填！";
+                        checkMsg = "编制维度选择岗位时，未找到对应岗位！";
                     } else {
                         JobPO jobPO = MapperProxyFactory.getProxy(JobMapper.class).getJobById(parentJobId);
                         if (null == jobPO) {

src/com/engine/organization/util/tree/SearchTreeUtil.java

@@ -91,7 +91,11 @@ public class SearchTreeUtil {
         Set<String> leafIds = new HashSet<>();
         List<SearchTree> collect = treeList.stream().peek(e -> {
             if (null != collects && CollectionUtils.isNotEmpty(collects.get(e.getId()))) {
-                List<TreeNode> nodes = collects.get(e.getId()).stream().sorted(Comparator.comparing(item -> null == item.getOrderNum() ? 0 : item.getOrderNum())).collect(Collectors.toList());
+                List<TreeNode> nodes = collects.get(e.getId()).stream().sorted(Comparator
+                                .comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                        )
+                        .collect(Collectors.toList());
                 e.setSubs(nodes);
                 leafIds.add(e.getId());
                 if (CollectionUtils.isNotEmpty(e.getSubs())) {
@@ -110,18 +114,25 @@ public class SearchTreeUtil {
      * @return
      */
     public static List<SearchTree> builderTreeMode(List<SearchTree> treeList, List<SearchTree> deptTrees) {
-        Map<String, List<TreeNode>> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
+        Map<String, List<SearchTree>> parentMap = treeList.stream().collect(Collectors.groupingBy(SearchTree::getPid));
         Map<String, List<SearchTree>> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp));
         boolean isAdd = !childMap.isEmpty();
         Set<String> leafIds = new HashSet<>();
         List<SearchTree> collect = treeList.stream().peek(e -> {
             Set<TreeNode> treeNodes = new LinkedHashSet<>();
             if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
-                List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(Comparator.comparing(SearchTree::getOrderNum)).collect(Collectors.toList());
+                List<SearchTree> searchTrees = childMap.get(e.getId()).stream().sorted(
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                ).collect(Collectors.toList());
                 treeNodes.addAll(searchTrees);
             }
-            List<TreeNode> nodes = parentMap.get(e.getId());
+            List<SearchTree> nodes = parentMap.get(e.getId());
             if (CollectionUtils.isNotEmpty(nodes)) {
+                nodes = nodes.stream().sorted(
+                        Comparator.comparingDouble(SearchTree::getOrderNum)
+                                .thenComparingDouble(SearchTree::getShowOrderOfTree)
+                ).collect(Collectors.toList());
                 treeNodes.addAll(nodes);
             }
             e.setSubs(new ArrayList<>(treeNodes));

src/com/engine/organization/web/StaffOutController.java

@@ -36,6 +36,11 @@ public class StaffOutController {
     public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
+            //ESB接口user对象是null
+            if (user == null) {
+                user = new User();
+                user.setUid(1);
+            }
             return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
@@ -48,6 +53,11 @@ public class StaffOutController {
     public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
+            //ESB接口user对象是null
+            if (user == null) {
+                user = new User();
+                user.setUid(1);
+            }
             return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);

src/com/engine/organization/wrapper/OrgChartWrapper.java

@@ -91,7 +91,7 @@ public class OrgChartWrapper extends Service {
         return getChartService(user).recordStatistics(param);
     }
 
-    public Map<Integer, HrmLabelVO> selectLabel() {
+    public Map<String, HrmLabelVO> selectLabel() {
         return getChartService(user).selectLabel();
     }
 

src/weaver/interfaces/organization/action/WorkflowStaffOperateAction.java

@@ -0,0 +1,169 @@
+package weaver.interfaces.organization.action;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.engine.organization.entity.hrmresource.po.ResourcePO;
+import com.engine.organization.entity.job.po.JobPO;
+import com.engine.organization.entity.staff.po.StaffPO;
+import com.engine.organization.enums.DeleteTypeEnum;
+import com.engine.organization.mapper.job.JobMapper;
+import com.engine.organization.mapper.staff.StaffMapper;
+import com.engine.organization.util.db.MapperProxyFactory;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.hrm.job.JobTitlesComInfo;
+import weaver.interfaces.workflow.action.Action;
+import weaver.soa.workflow.request.RequestInfo;
+
+import java.util.*;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/9/25 2:03 PM
+ * @Description: 流程明细编制信息操作初始化
+ * @Version 1.0
+ */
+public class WorkflowStaffOperateAction implements Action {
+
+    @Override
+    public String execute(RequestInfo requestInfo) {
+
+        String requestid = requestInfo.getRequestid();
+        int formid = Math.abs(requestInfo.getRequestManager().getFormid());
+
+        RecordSet rs = new RecordSet();
+
+        String mainTable = String.format("%s%s", "formtable_main_", formid);
+
+        String detaiTable = String.format("%s%s",mainTable,"_dt1");
+
+        //1.获取表单数据
+        rs.executeQuery("select a.bzfa,b.fb,b.bm,b.gw,b.bzs,b.zzs from "+mainTable+" as a \n" +
+                "right join "+detaiTable+" as b on a.id = b.mainid where a.requestid = ?",requestid);
+
+        List<StaffPO> staffList = new ArrayList<>();
+
+        while (rs.next()) {
+            StaffPO build = StaffPO.builder()
+                    .planId(Util.getIntValue(rs.getString("bzfa")))
+                    .compId(Util.getIntValue(rs.getString("fb")))
+                    .deptId(Util.getIntValue(rs.getString("bm")))
+                    .jobId(Util.getIntValue(rs.getString("gw")))
+                    .staffNum(Util.getIntValue(rs.getString("bzs")))
+                    .permanentNum(Util.getIntValue(rs.getString("zzs")))
+                    .build();
+            staffList.add(build);
+        }
+
+        if (CollectionUtil.isEmpty(staffList)) {
+            requestInfo.getRequestManager().setMessagecontent("未找到明细数据");
+            return Action.FAILURE_AND_CONTINUE;
+        }
+
+        Integer planId = staffList.get(0).getPlanId();
+
+        //2.数据处理，Ec岗位id替换为聚才林岗位id 不存在情况下新增岗位数据
+        buildJobTitle(staffList);
+
+        //3.根据方案id获取当前已有编制信息与流程明细比较；已存在的更新，未存在的新增
+        List<StaffPO> hStaffList = new ArrayList<>();
+        rs.executeQuery("select id,comp_id,dept_id,job_id,freeze_num from jcl_org_staff where plan_id = ? and delete_type = 0",planId);
+        while (rs.next()) {
+            StaffPO build = StaffPO.builder()
+                    .id((long) Util.getIntValue(rs.getString("id")))
+                    .compId(Util.getIntValue(rs.getString("comp_id")))
+                    .deptId(Util.getIntValue(rs.getString("dept_id")))
+                    .jobId(Util.getIntValue(rs.getString("job_id")))
+                    .freezeNum(Util.getIntValue(rs.getString("freeze_num")))
+                    .build();
+            hStaffList.add(build);
+        }
+
+        //新增的编制信息数据List
+        List<StaffPO> iStaffList = new ArrayList<>();
+
+        Map<String, StaffPO> hStaffMap = new HashMap<>();
+
+        for (StaffPO staff : hStaffList) {
+            String key = staff.getCompId() + "_" + staff.getDeptId() + "_" + staff.getJobId();
+            hStaffMap.put(key, staff);
+        }
+
+        for (StaffPO staff : staffList) {
+            String key = staff.getCompId() + "_" + staff.getDeptId() + "_" + staff.getJobId();
+            if (hStaffMap.containsKey(key)) {
+                StaffPO matchedStaff = hStaffMap.get(key);
+                matchedStaff.setPermanentNum(staff.getPermanentNum());
+                matchedStaff.setStaffNum(staff.getStaffNum());
+            }else {
+                iStaffList.add(staff);
+            }
+        }
+
+        //更新
+        hStaffList.forEach(item -> {
+            //todo 冻结数还原为0根据需求而定
+            buildStaffPO(item);
+            rs.executeUpdate("update jcl_org_staff set staff_num = ?,permanent_num = ?,lack_status = ? where id = ?",
+                    item.getStaffNum(),item.getPermanentNum(),item.getLackStatus(),item.getId());
+        });
+
+        //插入
+        iStaffList.forEach(staffPO -> {
+            staffPO.setFreezeNum(0);
+            staffPO.setControlPolicy(1);
+            staffPO.setDeleteType(0);
+            staffPO.setCreateTime(new Date());
+            staffPO.setUpdateTime(new Date());
+            staffPO.setCreator(1L);
+            buildStaffPO(staffPO);
+            MapperProxyFactory.getProxy(StaffMapper.class).insertIgnoreNull(staffPO);
+        });
+
+        return Action.FAILURE_AND_CONTINUE;
+    }
+
+
+    /**
+     * Ec岗位转换聚才林岗位
+     * @param staffList
+     */
+    private void buildJobTitle(List<StaffPO> staffList) {
+        JobTitlesComInfo jb = new JobTitlesComInfo();
+        staffList.forEach(item -> {
+            ResourcePO resourcePo = ResourcePO.builder().subcompanyid1(item.getCompId()).departmentid(item.getDeptId()).jobtitle(item.getJobId()).build();
+            JobPO jobByResource = MapperProxyFactory.getProxy(JobMapper.class).getJobByResource(resourcePo);
+            if (jobByResource == null) {
+                //岗位不存在新增
+                JobPO jobPO = JobPO.builder()
+                        .ecCompany(resourcePo.getSubcompanyid1())
+                        .ecDepartment(resourcePo.getDepartmentid())
+                        .ecJobTitle(resourcePo.getJobtitle())
+                        .isKey(0)
+                        .deleteType(DeleteTypeEnum.NOT_DELETED.getValue())
+                        .createTime(new Date())
+                        .updateTime(new Date())
+                        .build();
+                String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePo.getJobtitle()));
+                if (!"".equals(jobTitlescode)) {
+                    jobPO.setJobNo(jobTitlescode+"-"+resourcePo.getDepartmentid());
+                }
+                MapperProxyFactory.getProxy(JobMapper.class).insertIgnoreNull(jobPO);
+                item.setJobId(Math.toIntExact(jobPO.getId()));
+            }else {
+                item.setJobId(Math.toIntExact(jobByResource.getId()));
+            }
+
+
+        });
+    }
+
+
+    private static void  buildStaffPO(StaffPO staffPO) {
+        List<Integer> number = Arrays.asList(staffPO.getPermanentNum(),staffPO.getFreezeNum());
+        Integer sums = number.stream()
+                .mapToInt(Integer::intValue)
+                .sum();
+        Integer a = staffPO.getStaffNum();
+        staffPO.setLackStatus((a.compareTo(sums) < 0) ? 3 : ((a.compareTo(sums) == 0) ? 2 : 1));
+    }
+}

src/weaver/interfaces/organization/cronjob/DeleteIsCancelJobCrob.java

@@ -0,0 +1,65 @@
+package weaver.interfaces.organization.cronjob;
+
+import com.engine.organization.entity.job.po.JobPO;
+import com.engine.organization.mapper.job.JobMapper;
+import com.engine.organization.util.db.MapperProxyFactory;
+import org.apache.commons.collections.CollectionUtils;
+import weaver.conn.RecordSet;
+import weaver.general.Util;
+import weaver.interfaces.schedule.BaseCronJob;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/10/18 11:25 AM
+ * @Description: 自动清除已失效的岗位 （执行前请注意编制的引用，会出现名称为空）
+ * @Version 1.0
+ */
+public class DeleteIsCancelJobCrob extends BaseCronJob {
+
+    @Override
+    public void execute() {
+
+        RecordSet rs = new RecordSet();
+
+        List<JobPO> jobList = new ArrayList<>();
+        rs.executeQuery("select id,ec_jobtitle,ec_department from jcl_org_job where delete_type = 0");
+        while (rs.next()) {
+            jobList.add(JobPO.builder()
+                    .id((long)Util.getIntValue(rs.getString("id")))
+                    .ecJobTitle(Util.getIntValue(rs.getString("ec_jobtitle")))
+                    .ecDepartment(Util.getIntValue(rs.getString("ec_department")))
+                    .build());
+        }
+
+
+
+        List<Long> deleteIds = new ArrayList<>();
+
+        jobList.forEach(job -> {
+
+            //1.岗位是否封存或删除
+            rs.executeQuery("select id from hrmjobtitles where id = ? and (canceled is null or canceled != 1)",job.getEcJobTitle());
+            if (!rs.next()) {
+                deleteIds.add(job.getId());
+                return;
+            }
+
+            //2.部门是否封存或删除
+            rs.executeQuery("select id from hrmdepartment where id = ? and (canceled is null or canceled != 1)",job.getEcDepartment());
+            if (!rs.next()) {
+                deleteIds.add(job.getId());
+            }
+
+        });
+
+        if (CollectionUtils.isNotEmpty(deleteIds)) {
+            MapperProxyFactory.getProxy(JobMapper.class).deleteByIds(deleteIds);
+        }
+
+
+
+    }
+}

src/weaver/interfaces/organization/cronjob/StatisticsPersonCron.java

@@ -34,7 +34,7 @@ public class StatisticsPersonCron extends BaseCronJob {
     @Override
     public void execute() {
         Integer value = StringUtils.isNotBlank(companyId) ? Integer.parseInt(companyId) : null;
-        StatisticsParam build = StatisticsParam.builder().companyId(value).build();
+        StatisticsParam build = StatisticsParam.builder().companyId(null).build();
         User user = new User();
         user.setUid(1);
         getChartService(user).recordStatistics(build);

src/weaver/interfaces/organization/cronjob/TableDeleteDataCron.java

@@ -0,0 +1,34 @@
+package weaver.interfaces.organization.cronjob;
+
+import weaver.conn.RecordSet;
+import weaver.interfaces.schedule.BaseCronJob;
+
+/**
+ * @Author liang.cheng
+ * @Date 2024/10/10 1:56 PM
+ * @Description: 定时清除组织管理Delete_type=1的数据
+ * @Version 1.0
+ */
+public class TableDeleteDataCron extends BaseCronJob {
+
+    @Override
+    public void execute() {
+        RecordSet rs = new RecordSet();
+
+        rs.execute("delete from jcl_org_scheme where delete_type = 1");
+        rs.execute("delete from jcl_org_level where delete_type = 1");
+        rs.execute("delete from jcl_org_grade where delete_type = 1");
+        rs.execute("delete from jcl_org_sequence where delete_type = 1");
+        rs.execute("delete from jcl_org_staffplan where delete_type = 1");
+        rs.execute("delete from jcl_org_staff where delete_type = 1");
+        rs.execute("delete from jcl_org_job where delete_type = 1");
+        rs.execute("delete from jcl_org_jobext where delete_type = 1");
+        rs.execute("delete from jcl_org_jobext_dt1 where delete_type = 1");
+        rs.execute("delete from jcl_org_detach where delete_type = 1");
+        rs.execute("delete from jcl_org_cardaccess where delete_type = 1");
+        rs.execute("delete from jcl_org_cardbutton where delete_type = 1");
+        rs.execute("delete from jcl_field_extendgroup where delete_type = 1");
+        rs.execute("delete from jcl_field_extendtitle where delete_type = 1");
+        rs.execute("delete from jcl_field_extendinfo where delete_type = 1");
+    }
+}