Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

 Conflicts:

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

WEB-INF/config/MyBatis.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration
+		PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+	<settings>
+		<setting name="mapUnderscoreToCamelCase" value="true"></setting>
+		<setting name="jdbcTypeForNull" value="NULL"/>
+	</settings>
+	<plugins>
+		<plugin interceptor="weaver.conn.mybatis.MyBatisCachePlugin"></plugin>
+		<plugin interceptor="com.github.pagehelper.PageInterceptor"></plugin>
+	</plugins>
+	<environments default="development">
+		<environment id="development">
+			<transactionManager type="JDBC"/>
+			<dataSource type="weaver.conn.mybatis.MyBatisDataSourceFactory">
+			</dataSource>
+		</environment>
+	</environments>
+	<databaseIdProvider type="weaver.conn.mybatis.DatabaseIdProvider">
+	</databaseIdProvider>
+	<mappers>
+		<!--mapper resource="MyBatis/mapper/WorkflowBaseMapper.xml"/-->
+		<!--package name="*.mapper"></package 不可行，Mybatis不支持通配符，这是spring的ant匹配模式提供的-->
+		<package name="weaver.conn.mybatis.mapper"></package><!-- 示例Mapper -->
+
+		<!-- 项目Mapper -->
+		<package name="com.weaver.mapper"></package>
+		<package name="weaver.general.mapper"></package>
+		<package name="weaver.hrm.mapper"></package>
+		<package name="weaver.workflow.mapper"></package>
+		<package name="weaver.interfaces.mapper"></package>
+		<package name="weaver.portal.mapper"></package>
+		<package name="com.api.formmode.mybatis.mapper"></package>
+		<package name="com.cloudstore.dev.api.mapper"></package>
+		<package name="com.engine.integration.mapper"></package>
+		<package name="com.engine.salary.mapper"></package>
+		<package name="com.engine.organization.mapper"></package>
+		<!-- 需要把现在的配置文件都调整到WEB-INF/config/mapper目录下 -->
+		<!-- 在WEB-INF/config/mapper目录下配置的xml文件也不必加入这里的package -->
+	</mappers>
+</configuration>

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

WEB-INF/prop/hrmOrganization.properties

@@ -0,0 +1,2 @@
+defaultCloseNonStandard151=true
+detach=true

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);
 }

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.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import weaver.conn.RecordSet;
@@ -64,6 +66,8 @@ public class ManagerDetachServiceImpl extends Service implements ManagerDetachSe
         if (!hasRight) {
             return resultMap;
         }
+        String detach = new BaseBean().getPropValue("hrmOrganization", "detach");
+        resultMap.put("isDetach",detach);
         OrganizationWeaTable<ManagerDetachVO> table = new OrganizationWeaTable<>(user, ManagerDetachVO.class);
         String sqlWhere = buildSqlWhere(params);
         table.setSqlwhere(sqlWhere);
@@ -145,6 +149,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<String, Object> params) {
         DBType dbType = DBType.get(new RecordSet().getDBType());
         String sqlWhere = " where delete_type = 0";

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);
+        }
+    }
 }

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);
+    }
 }