diff --git a/WEB-INF/config/MyBatis.xml b/WEB-INF/config/MyBatis.xml new file mode 100644 index 00000000..7de8d02d --- /dev/null +++ b/WEB-INF/config/MyBatis.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WEB-INF/lib/pagehelper-5.0.0.jar b/WEB-INF/lib/pagehelper-5.0.0.jar new file mode 100644 index 00000000..187266c8 Binary files /dev/null and b/WEB-INF/lib/pagehelper-5.0.0.jar differ diff --git a/WEB-INF/prop/cacheBackList.properties b/WEB-INF/prop/cacheBackList.properties new file mode 100644 index 00000000..c5a6d151 --- /dev/null +++ b/WEB-INF/prop/cacheBackList.properties @@ -0,0 +1,74 @@ +hrmresource_online=hrmresource_online +sequenceindex=sequenceindex +system_default_col=system_default_col +worktask_requestbase=worktask_requestbase +indexupdatelog=indexupdatelog +uplogs=uplogs +dellogs=dellogs +ldapsetting=ldapsetting +ldapset=ldapset +workflowactionview=workflowactionview +picture=picture +slideElement=slideElement +hpOutDataTabSetting=hpOutDataTabSetting +hpoutdatasettingaddr=hpoutdatasettingaddr +wfex_view=wfex_view +hpOutDataSettingDef=hpOutDataSettingDef +hpOutDataSettingField=hpOutDataSettingField +view_workflowForm_selectAll=view_workflowForm_selectAll +QRCodeComInfo=QRCodeComInfo +emobileLoginKey=emobileLoginKey +rule_base=rule_base +rule_expressions=rule_expressions +rule_expressionbase=rule_expressionbase +rule_maplist=rule_maplist +uf_ShopCheckPlanbat=uf_ShopCheckPlanbat +uf_problemRegister=uf_problemRegister +uf_checkDataSave=uf_checkDataSave +uf_ShopCheckPlan=uf_ShopCheckPlan +uf_ShopCheckExam=uf_ShopCheckExam +uf_shopinfo=uf_shopinfo +uf_shopCheck=uf_shopCheck +uf_boroughinfo=uf_boroughinfo +View_ShopCheck=View_ShopCheck +user_tables=user_tables +sys.objects=sys.objects +USER_TAB_COLUMNS=USER_TAB_COLUMNS +syscolumns=syscolumns +blog_discuss=blog_discuss +kq_format_pool=kq_format_pool +kq_report_check=kq_report_check +license=license +ecologyuplist=ecologyuplist +kq_flow_split_leave=kq_flow_split_leave +kq_flow_split_evection=kq_flow_split_evection +kq_flow_split_out=kq_flow_split_out +kq_flow_split_overtime=kq_flow_split_overtime +kq_flow_split_other=kq_flow_split_other +kq_flow_split_leaveback=kq_flow_split_leaveback +KQ_ATT_VACATION=KQ_ATT_VACATION +kq_shiftschedule=kq_shiftschedule +kq_settings=kq_settings +dual=dual +user_tab_columns=user_tab_columns +syscolumns=syscolumns +Information_schema.columns=Information_schema.columns +ofs_todo_data=ofs_todo_data +SYSIBM.SYSTABLES=SYSIBM.SYSTABLES +Information_schema.columns=Information_schema.columns +ofs_todo_data=ofs_todo_data +information_schema.Tables=information_schema.Tables +sysobjects=sysobjects +hrmresourcemanager=hrmresourcemanager +QRTZ_TRIGGERS=QRTZ_TRIGGERS +fullsearch_schemaInfo=fullsearch_schemaInfo +Int_WhiteList=Int_WhiteList +Int_WhiteList_Mapping=Int_WhiteList_Mapping +#kq_format_detail +kq_format_detail=kq_format_detail +#hrmschedulesign +hrmschedulesign=hrmschedulesign +#聚才林 +jcl_org_map=jcl_org_map +v_jcl_zdzj=v_jcl_zdzj +v_jcl_post=v_jcl_post \ No newline at end of file diff --git a/WEB-INF/prop/hrmOrganization.properties b/WEB-INF/prop/hrmOrganization.properties new file mode 100644 index 00000000..7d6cd1ba --- /dev/null +++ b/WEB-INF/prop/hrmOrganization.properties @@ -0,0 +1,2 @@ +defaultCloseNonStandard151=true +detach=true \ No newline at end of file diff --git a/src/com/engine/organization/service/ManagerDetachService.java b/src/com/engine/organization/service/ManagerDetachService.java index c277693a..2a8619e3 100644 --- a/src/com/engine/organization/service/ManagerDetachService.java +++ b/src/com/engine/organization/service/ManagerDetachService.java @@ -47,4 +47,10 @@ public interface ManagerDetachService { * @return */ int updateDetach(ManagerDetachParam param); + + /** + * 分权开关 + * @param isDetach + */ + String doDetach(String isDetach); } diff --git a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java index 5aa68e4e..80362b35 100644 --- a/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java +++ b/src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java @@ -21,6 +21,8 @@ import com.engine.organization.util.OrganizationFormItemUtil; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.relation.EcHrmRelationUtil; +import com.weaver.file.ConfigOperator; +import com.weaver.general.BaseBean; import org.apache.commons.lang3.StringUtils; import weaver.conn.RecordSet; @@ -61,6 +63,8 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe if (!hasRight) { return resultMap; } + String detach = new BaseBean().getPropValue("hrmOrganization", "detach"); + resultMap.put("isDetach",detach); OrganizationWeaTable table = new OrganizationWeaTable<>(user, ManagerDetachVO.class); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); @@ -141,6 +145,13 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe return getMangeDetachMapper().updateDetach(managerDetachPO); } + @Override + public String doDetach(String isDetach) { + ConfigOperator ConfigOperator = new ConfigOperator(); + ConfigOperator.setProp("hrmOrganization.properties", "detach", isDetach); + return new BaseBean().getPropValue("hrmOrganization", "detach"); + } + private String buildSqlWhere(Map params) { DBType dbType = DBType.get(new RecordSet().getDBType()); String sqlWhere = " where delete_type = 0"; diff --git a/src/com/engine/organization/web/ManagerDetachController.java b/src/com/engine/organization/web/ManagerDetachController.java index b3e64274..a54b29fa 100644 --- a/src/com/engine/organization/web/ManagerDetachController.java +++ b/src/com/engine/organization/web/ManagerDetachController.java @@ -118,4 +118,17 @@ public class ManagerDetachController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/doDetach") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult doDetach(@Context HttpServletRequest request,@Context HttpServletResponse response, + @QueryParam("idDetach") String isDetach) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getManagerDetachWrapper(user).doDetach(isDetach)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java index 2efa8cb8..07f9808f 100644 --- a/src/com/engine/organization/wrapper/ManagerDetachWrapper.java +++ b/src/com/engine/organization/wrapper/ManagerDetachWrapper.java @@ -85,4 +85,9 @@ public class ManagerDetachWrapper extends OrganizationWrapper { }.getClass(), String.valueOf(managerDetachPO.getEcManager()), JSON.toJSONString(param), managerDetachPO, MapperProxyFactory.getProxy(ManagerDetachMapper.class).getDetachById(param.getId())); return result; } + + + public String doDetach(String isDetach) { + return getManagerDetachService(user).doDetach(isDetach); + } }