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

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

@@ -124,7 +124,7 @@ public class JobBrowserService extends BrowserService {
         // 所属分部
         SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "ecCompany", "");
         // 所属部门
-        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "ecDepartment", "");
+        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "ecDepartment", "");
 
         conditions.add(jobNoItem);
         conditions.add(jobNameItem);

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

@@ -51,21 +51,21 @@ public class HrmResourceVO {
     /**
      * 姓名
      */
-    @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname")
+    @OrganizationTableColumn(labelId = 547329, text = "姓名", width = "25%", column = "lastname")
     private String lastName;
     /**
      * 部门
      */
-    @OrganizationTableColumn(text = "部门", width = "25%", column = "departmentid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getDepartmentName")
+    @OrganizationTableColumn(labelId = 547331, text = "部门", width = "25%", column = "departmentid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getDepartmentName")
     private String departmentName;
 
     /**
      * 分部
      */
-    @OrganizationTableColumn(text = "分部", width = "25%", column = "subcompanyid1", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName")
+    @OrganizationTableColumn(labelId = 547332, text = "分部", width = "25%", column = "subcompanyid1", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getCompanyName")
     private String companyName;
 
-    @OrganizationTableColumn(text = "岗位", width = "25%", column = "jobtitle", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getJobName")
+    @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "25%", column = "jobtitle", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getJobName")
     private String jobName;
 
     /**

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

@@ -49,19 +49,19 @@ public class JobListDTO {
     /**
      * 所属部门
      */
-    @TableTitle(title = "所属部门", dataIndex = "departmentName", key = "departmentName")
+    @TableTitle(labelId = 547431, title = "所属部门", dataIndex = "departmentName", key = "departmentName")
     private String departmentName;
 
     /**
      * 职务类别
      */
-    @TableTitle(title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
+    @TableTitle(labelId = 547433, title = "职务类别", dataIndex = "jobGroupName", key = "jobGroupName")
     private String jobGroupName;
 
     /**
      * 所属职务
      */
-    @TableTitle(title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
+    @TableTitle(labelId = 547434, title = "所属职务", dataIndex = "jobActivityName", key = "jobActivityName")
     private String jobActivityName;
     /**
      * 上级岗位
@@ -74,7 +74,7 @@ public class JobListDTO {
     /**
      * 是否关键岗
      */
-    @TableTitle(title = "是否关键岗", dataIndex = "isKey", key = "isKey")
+    @TableTitle(labelId = 547417, title = "是否关键岗", dataIndex = "isKey", key = "isKey")
     private String isKey;
 
     /**

src/com/engine/organization/entity/logview/vo/LogViewVO.java

@@ -27,31 +27,31 @@ import java.util.Date;
 )
 public class LogViewVO {
 
-    @OrganizationTableColumn(text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat")
+    @OrganizationTableColumn(labelId = 547159, text = "操作时间", width = "20%", column = "create_time", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getDateTimeFormat")
     private Date createTime;
 
-    @OrganizationTableColumn(text = "操作者", width = "16%", column = "operator_name")
+    @OrganizationTableColumn(labelId = 547160, text = "操作者", width = "16%", column = "operator_name")
     private String operator;
 
-    @OrganizationTableColumn(text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
+    @OrganizationTableColumn(labelId = 547161, text = "操作类型", width = "16%", column = "operate_type", transmethod = "com.engine.organization.transmethod.LogViewTransMethod.getOperateType")
     private String operateType;
 
-    @OrganizationTableColumn(text = "操作描述", width = "16%", column = "operate_desc")
+    @OrganizationTableColumn(labelId = 547162, text = "操作描述", width = "16%", column = "operate_desc")
     private String operateDesc;
 
-    @OrganizationTableColumn(text = "对象", width = "16%", column = "value")
+    @OrganizationTableColumn(labelId = 547163, text = "对象", width = "16%", column = "value")
     private String value;
 
-    @OrganizationTableColumn(text = "所属模块", width = "16%", column = "operate_module_name")
+    @OrganizationTableColumn(labelId = 547164, text = "所属模块", width = "16%", column = "operate_module_name")
     private String operateModuleName;
 
-    @OrganizationTableColumn(text = "修改详情", width = "16%", column = "message")
+    @OrganizationTableColumn(labelId = 547165, text = "修改详情", width = "16%", column = "message")
     private String showDetail;
 
-    @OrganizationTableColumn(text = "操作IP", width = "16%", column = "client_ip")
+    @OrganizationTableColumn(labelId = 547166, text = "操作IP", width = "16%", column = "client_ip")
     private String clientIp;
 
-    @OrganizationTableColumn(text = "操作参数", width = "16%", column = "params_str", display = false)
+    @OrganizationTableColumn(labelId = 547413, text = "操作参数", width = "16%", column = "params_str", display = false)
     private String paramsStr;
 
 }

src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java

@@ -40,22 +40,22 @@ public class CardAccessVO {
     @OrganizationTableColumn(column = "id", display = false)
     private Long id;
 
-    @OrganizationTableColumn(text = "栏目", width = "15%", column = "type_name")
+    @OrganizationTableColumn(labelId = 547389, text = "栏目", width = "15%", column = "type_name")
     private Integer typeName;
 
     @OrganizationTableColumn(labelId = 547130, text = "是否启用", width = "15%", column = "status")
     private Integer status;
 
-    @OrganizationTableColumn(text = "所有人可见", width = "15%", column = "all_people")
+    @OrganizationTableColumn(labelId = 547390, text = "所有人可见", width = "15%", column = "all_people")
     private Integer allPeople;
 
-    @OrganizationTableColumn(text = "上级可见", width = "15%", column = "superior")
+    @OrganizationTableColumn(labelId = 547392, text = "上级可见", width = "15%", column = "superior")
     private Integer superior;
 
-    @OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior")
+    @OrganizationTableColumn(labelId = 547392, text = "所有上级可见", width = "15%", column = "all_superior")
     private Integer allSuperior;
 
-    @OrganizationTableColumn(text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
+    @OrganizationTableColumn(labelId = 547414, text = "查看自定义", width = "30%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName")
     private String custom;
 
 }

src/com/engine/organization/entity/staff/vo/StaffPlanTableVO.java

@@ -56,22 +56,22 @@ public class StaffPlanTableVO {
     /**
      * w维度
      */
-    @OrganizationTableColumn(text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
+    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "16%", column = "control_dimension",transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
     private String controlDimension;
     /**
      * 年度
      */
-    @OrganizationTableColumn(text = "年度", width = "16%", column = "plan_year")
+    @OrganizationTableColumn(labelId = 546937, text = "年度", width = "16%", column = "plan_year")
     private Integer planYear;
     /**
      * 时间开始
      */
-    @OrganizationTableColumn(text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
+    @OrganizationTableColumn(labelId = 547337, text = "时间开始", width = "16%", column = "time_start", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
     private String timeStart;
     /**
      * 时间结束
      */
-    @OrganizationTableColumn(text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
+    @OrganizationTableColumn(labelId = 547338, text = "时间结束", width = "16%", column = "time_end", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getFormatDateString")
     private String timeEnd;
     /**
      * 状态

src/com/engine/organization/entity/staff/vo/StaffTableVO.java

@@ -43,52 +43,52 @@ public class StaffTableVO {
     /**
      * 方案id
      */
-    @OrganizationTableColumn(text = "方案", width = "10%", column = "plan_id", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getSpanById")
+    @OrganizationTableColumn(labelId = 547344, text = "方案", width = "10%", column = "plan_id", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getSpanById")
     private String planId;
     /**
      * 维度
      */
-    @OrganizationTableColumn(text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
+    @OrganizationTableColumn(labelId = 547293, text = "维度", width = "10%", column = "control_dimension", transmethod = "com.engine.organization.transmethod.StaffPlanTransMethod.getControlDimension")
     private String controlDimension;
     /**
      * 分部
      */
-    @OrganizationTableColumn(text = "分部", width = "10%", column = "comp_id", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
+    @OrganizationTableColumn(labelId = 547332, text = "分部", width = "10%", column = "comp_id", transmethod = "com.engine.organization.transmethod.CompTransMethod.getSpanById")
     private String compId;
     /**
      * 部门
      */
-    @OrganizationTableColumn(text = "部门", width = "10%", column = "dept_id", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById")
+    @OrganizationTableColumn(labelId = 547331, text = "部门", width = "10%", column = "dept_id", transmethod = "com.engine.organization.transmethod.DepartmentTransMethod.getSpanById")
     private String deptId;
     /**
      * 岗位
      */
-    @OrganizationTableColumn(text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById")
+    @OrganizationTableColumn(labelId = 547333, text = "岗位", width = "10%", column = "job_id", transmethod = "com.engine.organization.transmethod.JobTransMethod.getSpanById")
     private String jobId;
     /**
      * 编制数
      */
-    @OrganizationTableColumn(text = "编制数", width = "10%", column = "staff_num")
+    @OrganizationTableColumn(labelId = 547345, text = "编制数", width = "10%", column = "staff_num")
     private Integer staffNum;
     /**
      * 在编
      */
-    @OrganizationTableColumn(text = "在编", width = "10%", column = "permanent_num")
+    @OrganizationTableColumn(labelId = 547346, text = "在编", width = "10%", column = "permanent_num")
     private Integer permanentNum;
     /**
      * 冻结数
      */
-    @OrganizationTableColumn(text = "冻结数", width = "10%", column = "freeze_num")
+    @OrganizationTableColumn(labelId = 547347, text = "冻结数", width = "10%", column = "freeze_num")
     private Integer freezeNum;
     /**
      * 缺编状态
      */
-    @OrganizationTableColumn(text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan")
+    @OrganizationTableColumn(labelId = 547348, text = "缺编状态", width = "10%", column = "lack_status", transmethod = "com.engine.organization.transmethod.StaffTransMethod.getLackSpan")
     private String lackStatus;
     /**
      * 编制描述
      */
-    @OrganizationTableColumn(text = "编制描述", width = "10%", column = "staff_desc")
+    @OrganizationTableColumn(labelId = 547349, text = "编制描述", width = "10%", column = "staff_desc")
     private String staffDesc;
 
 }

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java

@@ -3,7 +3,6 @@ package com.engine.organization.mapper.hrmresource;
 
 import com.engine.organization.entity.commom.RecordInfo;
 import com.engine.organization.entity.jclimport.po.CusFormFieldPO;
-import com.engine.organization.entity.jclimport.po.JclSelectItem;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
@@ -44,19 +43,6 @@ public interface SystemDataMapper {
      */
     int updateResourceJobTitleByIds(@Param("jobTitle") String jobTitle, @Param("ids") Collection<Long> ids);
 
-    /**
-     * 人员，hrmResource表字段
-     *
-     * @return
-     */
-    List<CusFormFieldPO> getHrmFieldBeanList();
-
-    List<CusFormFieldPO> getHrmFieldBeanListByFields(@Param("fields") Collection<String> fields);
-
-    List<CusFormFieldPO> getHrmCustomFieldList();
-
-    List<JclSelectItem> getSelectItems(@Param("tableName") String tableName, @Param("fieldId") Long fieldId);
-
     Long getHrmResourceMaxId();
 
     List<String> getBatchUuidByIds(@Param("tableName") String tableName, @Param("ecIds") List<String> ecIds);

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -100,57 +100,6 @@
         where departmentid = #{departmentId}
           And jobTitle = #{jobTitle}
     </select>
-    <select id="getHrmFieldBeanList" resultMap="CustomFieldMap">
-        select b.labelname   as fieldlable,
-               '0'           as scopeid,
-               a.fieldid,
-               a.fieldname,
-               a.ismand,
-               a.fieldhtmltype,
-               a.type,
-               'hrmresource' as tablename
-        from hrm_formfield a
-                 inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-        where a.fielddbtype != '6'
-        order by groupid, fieldorder
-    </select>
-    <select id="getHrmCustomFieldList" resultMap="CustomFieldMap">
-        select b.labelname      as fieldlable,
-               a.scopeid,
-               a.fieldid,
-               a.hrm_fieldlable as fieldname,
-               a.ismand,
-               c.fieldhtmltype,
-               c.type,
-               a.dmlurl,
-               'cus_fielddata'  as tablename
-        from cus_formfield a
-                 inner join htmllabelinfo b on a.fieldlable = b.indexid and b.languageid = 7
-                 inner join cus_formdict c on a.fieldid = c.id and c.fieldhtmltype != '6'
-        order by groupid, fieldorder
-    </select>
-    <select id="getSelectItems" resultMap="SelectItemMap">
-        select fieldid, selectvalue, selectname
-        from ${tableName} and fieldid = #{fieldId}
-    </select>
-    <select id="getHrmFieldBeanListByFields" resultMap="CustomFieldMap">
-        select b.labelname as fieldlable,
-        a.fieldid,
-        a.fieldname,
-        a.ismand,
-        a.fieldhtmltype,
-        a.type,
-        '0' as scopeid,
-        'hrmresource' as tablename
-        from hrm_formfield a
-        inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-        where a.fielddbtype != '6' and a.isuse = '1'
-        and a.fieldname in
-        <foreach collection="fields" open="(" item="field" separator="," close=")">
-            #{field}
-        </foreach>
-        order by groupid ,fieldorder
-    </select>
     <select id="getHrmResourceMaxId" resultType="java.lang.Long">
         select max(id)
         from hrmresource

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

@@ -1,6 +1,5 @@
 package com.engine.organization.mapper.resource;
 
-import com.alibaba.fastjson.JSONObject;
 import com.engine.organization.entity.hrmresource.param.SearchTemplateParam;
 import com.engine.organization.entity.hrmresource.po.ResourceChartPO;
 import com.engine.organization.entity.hrmresource.po.ResourcePO;
@@ -74,9 +73,8 @@ public interface HrmResourceMapper {
 
     Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
 
-    List<JSONObject> queryAllResColumns(@Param("level") String level, @Param("grade") String grade);
 
-    String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId);
+    String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
 
 
     /**

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

@@ -408,11 +408,7 @@
         </if>
     </sql>
 
-    <select id="queryAllResColumns" parameterType="java.lang.String" resultType="com.alibaba.fastjson.JSONObject">
-        select a.fieldid, a.fieldname, b.labelname, a.issystem, a.ismand
-        from hrm_formfield a
-                 inner join htmllabelinfo b on a.fieldlabel = b.indexid and b.languageid = 7
-    </select>
+
     <select id="getSearchTemplateByName"
             resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
         select *
@@ -433,12 +429,13 @@
         from hrm_formfield a
                  inner join htmllabelinfo b on a.fieldlabel = b.indexid
         where a.FIELDNAME = #{fieldName}
-          and b.LANGUAGEID = '7'
+          and b.LANGUAGEID = ${language}
         union all
-        SELECT t1.hrm_fieldlable as labelname
+        SELECT t3.LABELNAME as labelname
         FROM cus_formfield t1,
-             cus_formdict t2
-        WHERE t1.fieldid = t2.id
+             cus_formdict t2,
+             htmllabelinfo t3
+        WHERE t1.fieldid = t2.id and t1.FIELDLABLE = t3.indexid and t3.LANGUAGEID = ${language}
           AND t1.scope = 'HrmCustomFieldByInfoType'
           and t1.SCOPEID = #{scopeId}
           and t2.fieldname = #{fieldName}

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

@@ -102,10 +102,10 @@ public class CardAccessServiceImpl extends Service implements CardAccessService
     @Override
     public Map<String, Object> getCardButtonTable() {
         List<ExtendInfoPO> infoPOList = new ArrayList<>();
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("按钮名称").fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc(SystemEnv.getHtmlLabelName(547386,user.getLanguage())).fieldType("varchar(50)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build());
         infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("status").fieldNameDesc(SystemEnv.getHtmlLabelName(547186, user.getLanguage())).fieldType("char(1)").controlType(7).browserType("1").customValue("[\"check\"]").showOrder(2).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc("跳转地址").fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
-        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc("角色").fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("url").fieldNameDesc(SystemEnv.getHtmlLabelName(547387,user.getLanguage())).fieldType("varchar(1000)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"1000\"]").showOrder(3).isrequired(0).isSystemDefault(0).build());
+        infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("roles").fieldNameDesc(SystemEnv.getHtmlLabelName(547388,user.getLanguage())).fieldType("text").controlType(3).browserType("65").customValue("[\"browser\",{\"valueSpan\":\"多角色\",\"replaceDatas\":[{\"itemorderid\":\"65\",\"name\":\"多角色\",\"id\":\"65\",\"parenttitle\":\"人员\",\"title\":\"人员-多角色\"}],\"value\":\"65\"}]").showOrder(4).isrequired(0).isSystemDefault(0).build());
 
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true));

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

@@ -55,7 +55,7 @@ public class CodeSettingServiceImpl extends Service implements CodeSettingServic
                 break;
         }
         retmap.put("hasRight", hasRight);
-        return ReturnResult.successed(retmap);
+        return ReturnResult.successed(user,retmap);
     }
 
     @Override

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

@@ -15,7 +15,6 @@ import com.engine.organization.entity.department.dto.DepartmentListDTO;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.hrmresource.po.SearchTemplatePO;
 import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
-import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.resource.HrmResourceMapper;
 import com.engine.organization.mapper.resource.ResourceMapper;
@@ -148,7 +147,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ
                 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));
+                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);
                 weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");

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

@@ -4,14 +4,15 @@ import com.engine.organization.entity.staff.param.StaffOutParam;
 import com.engine.organization.entity.staff.po.StaffPO;
 import com.engine.organization.enums.ModuleTypeEnum;
 import com.engine.organization.enums.StaffChangeEnum;
-import com.engine.organization.exception.OrganizationRunTimeException;
 import com.engine.organization.mapper.staff.StaffMapper;
 import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import lombok.SneakyThrows;
 import org.apache.commons.collections.CollectionUtils;
+import weaver.hrm.User;
 import weaver.hrm.company.DepartmentComInfo;
 import weaver.hrm.company.SubCompanyComInfo;
+import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
 import java.util.function.Function;
@@ -33,13 +34,16 @@ public class FunctionOutStaffServiceImpl {
         return MapperProxyFactory.getProxy(StaffMapper.class);
     }
 
-    FunctionOutStaffServiceImpl(){
+    private User user;
+
+    FunctionOutStaffServiceImpl(User user){
         affairFunctionS.put(StaffChangeEnum.ADD, this::addStaffNums);
         affairFunctionS.put(StaffChangeEnum.REDUCE, this::reduceStaffNums);
         affairFunctionS.put(StaffChangeEnum.FROZEN, this::frozenStaffNums);
         affairFunctionS.put(StaffChangeEnum.ENTRY, this::entryAdd);
         affairFunctionS.put(StaffChangeEnum.DIMISSION, this::dimissionReduce);
         affairFunctionS.put(StaffChangeEnum.TRANSFER, this::transfer);
+        this.user = user;
     }
 
 
@@ -62,7 +66,7 @@ public class FunctionOutStaffServiceImpl {
                 .orElse(0);
         Integer sums = staffPO.getPermanentNum() + staffPO.getFreezeNum();
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(difference.compareTo(sums) < 0,"存在编制超编风险,请先修改控制策略");
+            OrganizationAssert.isFalse(difference.compareTo(sums) < 0, SystemEnv.getHtmlLabelName(547453,user.getLanguage()));
         }
         staffPO.setStaffNum(difference < 0 ? 0 :difference);
         buildStaffPO(staffPO);
@@ -77,7 +81,7 @@ public class FunctionOutStaffServiceImpl {
                 .mapToInt(Integer::intValue)
                 .sum();
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
-            OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, "冻结数不能大于剩余编制数！");
+            OrganizationAssert.isFalse(sum.compareTo(staffPO.getStaffNum()) > 0, SystemEnv.getHtmlLabelName(547469,user.getLanguage()));
         }
         staffPO.setFreezeNum(sum);
         buildStaffPO(staffPO);
@@ -98,8 +102,8 @@ public class FunctionOutStaffServiceImpl {
         //强控策略下不容许超编
         if (staffPO.getControlPolicy().equals(HARDCONTROLLER)) {
             //冻结数释放
-            OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),"强控策略下请先释放当前冻结数后再完成入职操作");
-            OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),"强控策略下不容许超编");
+            OrganizationAssert.isFalse((sums > staffPO.getStaffNum() && staffPO.getFreezeNum() > 0),SystemEnv.getHtmlLabelName(547470,user.getLanguage()));
+            OrganizationAssert.isFalse( sums > staffPO.getStaffNum(),SystemEnv.getHtmlLabelName(547471,user.getLanguage()));
         }
         //向上部门 分部在编数调整
         upwardReviewSums(param);
@@ -117,7 +121,7 @@ public class FunctionOutStaffServiceImpl {
 
     private Integer dimissionReduce(StaffOutParam param) {
         StaffPO staffPO = select(param);
-        OrganizationAssert.isFalse(param.getNum().compareTo(staffPO.getPermanentNum()) > 0,"调整数量不可大于在编数");
+        OrganizationAssert.isFalse(param.getNum().compareTo(staffPO.getPermanentNum()) > 0,SystemEnv.getHtmlLabelName(547472,user.getLanguage()));
         List<Integer> numbers = Arrays.asList(staffPO.getPermanentNum(),param.getNum());
         Integer difference = numbers.stream()
                 .reduce((a, b) -> a - b)
@@ -219,7 +223,7 @@ public class FunctionOutStaffServiceImpl {
 
     private  StaffPO select(StaffOutParam param) {
         List<StaffPO> staffPO = staffMapper().customSelect(param.getPlanId(), param.getCompany(), param.getDepartment(), param.getJob());
-        OrganizationAssert.notEmpty(staffPO,"未查询到对应编制方案下的组织编制信息！");
+        OrganizationAssert.notEmpty(staffPO,SystemEnv.getHtmlLabelName(547474,user.getLanguage()));
         return staffPO.get(0);
     }
 

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

@@ -183,7 +183,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             String scopeId = columnName.split("_")[0];
             String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
             WeaTableColumn weaTableColumn = new WeaTableColumn();
-            weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId));
+            weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId,user.getLanguage()));
             weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
 
             weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
@@ -574,7 +574,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
             rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
         }
-        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName(SystemEnv.getHtmlLabelName(547136,user.getLanguage())).type("BTN_COLUMN").build());
         rightMenuList.add(MenuBtn.rightMenu_btnLog(user.getLanguage()));
         btnDatas.put("topMenu", topMenuList);
         btnDatas.put("rightMenu", rightMenuList);
@@ -588,64 +588,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         OrganizationAssert.notBlank(viewAttrStr, "未指定操作类型，请确认");
         String id = Util.null2String(params.get("id"));
         OrganizationAssert.notBlank(id, "数据有误，请确认");
-        int viewAttr = Integer.parseInt(viewAttrStr);
         Map<String, Object> apiDatas = new HashMap<>();
-
-        //List<SearchConditionGroup> addGroups = new ArrayList<>();
-        //SearchConditionItem schemeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "等级方案", "161", "schemeId", "schemeBrowser");
-        //schemeId.setRules("required");
-        //SearchConditionItem gradeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职级", "161", "gradeId", "gradeBrowser");
-        //gradeId.setRules("required");
-        //SearchConditionItem levelId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职等", "162", "levelId", "levelBrowser");
-        //levelId.setRules("required");
-        //SearchConditionItem sequenceId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
-        //sequenceId.setRules("required");
-        //SearchConditionItem postId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务分类", "161", "postId", "postBrowser");
-        //postId.setRules("required");
-        //SearchConditionItem postInfoId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务信息", "161", "postInfoId", "postInfoBrowser");
-        //postInfoId.setRules("required");
-        //SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "分部", "164", "companyId", "");
-        //companyId.setRules("required");
-        //SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "部门", "4", "departmentId", "");
-        //departmentId.setRules("required");
-        //SearchConditionItem jobId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位", "161", "jobId", "jobBrowser");
-        //jobId.setRules("required");
-        //
-        //
-        //// 编辑状态下赋值操作
-        //HrmRelationPO relationPO = getHrmRelationMapper().getRelationById(Long.parseLong(id));
-        //if (null != relationPO) {
-        //    setBrowserValue(schemeId, relationPO.getSchemeId(), getSchemeMapper().listSchemesByIds(Stream.of(relationPO.getSchemeId()).collect(Collectors.toList())), null, null);
-        //    setBrowserValue(gradeId, relationPO.getGradeId(), getGradeMapper().listGradessByIds(Stream.of(relationPO.getGradeId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
-        //    setBrowserValue(levelId, relationPO.getLevelId(), getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(relationPO.getLevelId()).build().getIds()), "grade_id", relationPO.getGradeId());
-        //    setBrowserValue(sequenceId, relationPO.getSequenceId(), getSequenceMapper().listSequencesByIds(Stream.of(relationPO.getSequenceId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
-        //    setBrowserValue(postId, relationPO.getPostId(), getPostMapper().listPostsByIds(Stream.of(relationPO.getPostId()).collect(Collectors.toList())), null, null);
-        //    setBrowserValue(postInfoId, relationPO.getPostInfoId(), getPostInfoMapper().listPostInfosByIds(Stream.of(relationPO.getPostInfoId()).collect(Collectors.toList())), "post_id", relationPO.getPostId());
-        //
-        //    List<Map<String, Object>> companyMaps = new ArrayList<>();
-        //    String scCompanyNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScCompanyNameById(relationPO.getCompanyId().toString());
-        //    Map<String, Object> companyMap = new HashMap<>();
-        //    companyMap.put(relationPO.getCompanyId().toString(), scCompanyNameById);
-        //    companyMaps.add(companyMap);
-        //    setBrowserValue(companyId, relationPO.getCompanyId(), companyMaps, null, null);
-        //
-        //    List<Map<String, Object>> departmentMaps = new ArrayList<>();
-        //    String departmentNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScDepartmentNameById(relationPO.getDepartmentId().toString());
-        //    Map<String, Object> departmentMap = new HashMap<>();
-        //    departmentMap.put(relationPO.getDepartmentId().toString(), departmentNameById);
-        //    departmentMaps.add(departmentMap);
-        //    setBrowserValue(departmentId, relationPO.getDepartmentId(), departmentMaps, "subcompany1", relationPO.getCompanyId());
-        //
-        //    setBrowserValue(jobId, relationPO.getJobId(), getJobMapper().listJobsByIds(Stream.of(relationPO.getJobId()).collect(Collectors.toList())), "departmentid", relationPO.getDepartmentId());
-        //}
-        //
-        //addGroups.add(new SearchConditionGroup("岗职位体系", true, Stream.of(schemeId, gradeId, levelId, sequenceId, postId, postInfoId).collect(Collectors.toList())));
-        //addGroups.add(new SearchConditionGroup("组织机构", true, Stream.of(companyId, departmentId, jobId).collect(Collectors.toList())));
-        //HashMap<String, Object> buttonsMap = new HashMap<>();
-        //buttonsMap.put("hasEdit", true);
-        //buttonsMap.put("hasSave", true);
-        //apiDatas.put("buttons", buttonsMap);
-        //apiDatas.put("conditions", addGroups);
         return apiDatas;
     }
 
@@ -713,15 +656,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         tabInfoMap.put("selectedData", isUsedMap);
         tabInfoMap.put("isModalEdit", false);
         return tabInfoMap;
-
-
-//        OrganizationWeaTable<JclOrgCustomTemplateVO> table = new OrganizationWeaTable<>(user, JclOrgCustomTemplateVO.class);
-//        String sqlWhere = buildSqlWhere(params);
-//        table.setSqlwhere(sqlWhere);
-//        WeaResultMsg result = new WeaResultMsg(false);
-//        result.putAll(table.makeDataResult());
-//        result.success();
-//        return new HashMap<>(result.getResultMap());
     }
 
     /**

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

@@ -205,12 +205,12 @@ public class JobServiceImpl extends Service implements JobService {
         int userLanguage = user.getLanguage();
         // 批量删除
         topMenuList.add(MenuBtn.topMenu_batchDelete(userLanguage));
-        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
+        topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
         topMenuList.add(MenuBtn.topMenu_addNew(userLanguage));
         btnDatas.put("topMenu", topMenuList);
         // 日志
         rightMenuList.add(MenuBtn.rightMenu_btnLog(userLanguage));
-        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName("刷新").type("BTN_REFRESH").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("refresh").menuIcon("icon-coms-Refresh").menuName(SystemEnv.getHtmlLabelName(547432,userLanguage)).type("BTN_REFRESH").build());
         rightMenuList.add(MenuBtn.rightMenu_addNew(userLanguage));
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
@@ -228,23 +228,16 @@ public class JobServiceImpl extends Service implements JobService {
         // 所属分部
         SearchConditionItem parentCompBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547128, "164", "subcompanyid1", "");
         // 所属部门
-        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "所属部门", "4", "departmentid", "");
+        SearchConditionItem parentDeptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547431, "4", "departmentid", "");
         // 是否关键岗
         List<SearchConditionOption> isKeyOptions = new ArrayList<>();
-        SearchConditionOption yesOption = new SearchConditionOption("0", "否");
-        SearchConditionOption noOption = new SearchConditionOption("1", "是");
+        SearchConditionOption yesOption = new SearchConditionOption("0", SystemEnv.getHtmlLabelName(547419,user.getLanguage()));
+        SearchConditionOption noOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547420,user.getLanguage()));
         isKeyOptions.add(yesOption);
         isKeyOptions.add(noOption);
-        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "isKey");
+        SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, 547417, "isKey");
         // 工作地点
-        SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
-        // 禁用标记
-        //List<SearchConditionOption> selectOptions = new ArrayList<>();
-        //SearchConditionOption enableOption = new SearchConditionOption("true", "启用");
-        //SearchConditionOption disableOption = new SearchConditionOption("false", "封存");
-        //selectOptions.add(enableOption);
-        //selectOptions.add(disableOption);
-        //SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "封存", "forbiddenTag");
+        SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547418, "workplace");
 
         conditionItems.add(jobNoItem);
         conditionItems.add(jobTitleNameItem);
@@ -252,7 +245,6 @@ public class JobServiceImpl extends Service implements JobService {
         conditionItems.add(parentDeptBrowserItem);
         conditionItems.add(isKeyItem);
         conditionItems.add(workplaceItem);
-        //conditionItems.add(forbiddenTagItem);
 
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
@@ -361,10 +353,6 @@ public class JobServiceImpl extends Service implements JobService {
     public Long saveBaseForm(Map<String, Object> params) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         JobSearchParam searchParam = JSONObject.parseObject(JSONObject.toJSONString(params), JobSearchParam.class);
-        //String jobNo = (String) params.get("job_no");
-        //// 判断是否开启自动编号
-        //jobNo = repeatDetermine(jobNo);
-        //params.put("job_no", jobNo);
         params.put("is_key", null == searchParam.getIsKey() ? 0 : searchParam.getIsKey());
         if (null != searchParam.getParentJob()) {
             JobPO parentJob = getJobMapper().getJobById(searchParam.getParentJob());
@@ -387,14 +375,12 @@ public class JobServiceImpl extends Service implements JobService {
         // 判断岗位是否重复
         ResourcePO build = ResourcePO.builder().subcompanyid1(Integer.parseInt(Util.null2String(params.get("ec_company")))).departmentid(Integer.parseInt(Util.null2String(params.get("ec_department")))).jobtitle(Integer.parseInt(Util.null2String(params.get("ec_jobTitle")))).build();
         int count = getJobMapper().selectByConditions(build);
-        OrganizationAssert.isTrue(count <= 0, "已存在相同维度岗位,请勿重复添加");
+        OrganizationAssert.isTrue(count <= 0, SystemEnv.getHtmlLabelName(547421,user.getLanguage()));
 
         String jobNo = (String) params.get("job_no");
         // 判断是否开启自动编号
         jobNo = repeatDetermine(jobNo);
         params.put("job_no", jobNo);
-        //params.put("jobactivityid", JOB_ACTIVITY_ID);
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.ADD, params).sync();
         return getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);
     }
 
@@ -407,7 +393,7 @@ public class JobServiceImpl extends Service implements JobService {
         // 上级岗位不能选择本身
         String parent_job = Util.null2String(params.get("parent_job"));
         if (StringUtils.isNotBlank(parent_job)) {
-            OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), "上级岗位不能选择本身");
+            OrganizationAssert.isFalse(parent_job.equals(searchParam.getId().toString()), SystemEnv.getHtmlLabelName(547422,user.getLanguage()));
         }
         if ("0".equals(groupId) || GROUP_ID.toString().equals(groupId)) {
             JobPO oldJobPO = getJobMapper().getJobById(searchParam.getId());
@@ -443,7 +429,7 @@ public class JobServiceImpl extends Service implements JobService {
     @Override
     public int copyJobItem(String ids, String department) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
-        OrganizationAssert.notBlank(department, "请指定需要复制的部门");
+        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();
@@ -464,8 +450,6 @@ public class JobServiceImpl extends Service implements JobService {
             jobById.setParentJob(null);
             jobById.setShowOrder(orderNum);
             insertCount += getJobMapper().insertIgnoreNull(jobById);
-            // 更新组织架构图
-            // new JobTriggerRunnable(jobById.getId()).run();
         }
 
         return insertCount;
@@ -479,20 +463,16 @@ public class JobServiceImpl extends Service implements JobService {
         if (params.getForbiddenTag()) {
             // 启用：判断上级部门是否启用，上级部门启用，岗位才可启用
             DepartmentPO parentDepartment = getDepartmentMapper().getDeptById(jobById.getEcDepartment());
-            OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), "该岗位不能解封，请先解封上级部门");
+            OrganizationAssert.isTrue(0 == parentDepartment.getCanceled(), SystemEnv.getHtmlLabelName(547424,user.getLanguage()));
 
             // 启用：判断上级岗位是否启用，上级岗位启用，岗位才可启用
             if (null != jobById.getParentJob()) {
                 JobPO parentJob = getJobMapper().getJobById(jobById.getParentJob());
-                OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), "该岗位不能解封，请先解封上级岗位");
+                OrganizationAssert.isTrue(0 == parentJob.getForbiddenTag(), SystemEnv.getHtmlLabelName(547436,user.getLanguage()));
             }
         } else {
-            //禁用：判断当前岗位下是否有人员，如有人员则不能禁用
-            // int hasResource = getJobMapper().isHasResource(params.getId());
-            // OrganizationAssert.isTrue(hasResource == 0, "该岗位存在人员，不能封存");
-            throw new OrganizationRunTimeException("该岗位不能封存");
+            throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547425,user.getLanguage()));
         }
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobPO).sync();
         return getJobMapper().updateForbiddenTagById(jobPO.getId(), jobPO.getForbiddenTag());
     }
 
@@ -504,10 +484,8 @@ public class JobServiceImpl extends Service implements JobService {
         for (JobPO jobsById : jobsByIds) {
             // 判断是否可以删除
             List<String> allowDelete = getJobMapper().isAllowDelete(jobsById.getId());
-            OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), "该岗位存在引用，不允许删除");
+            OrganizationAssert.isTrue(CollectionUtils.isEmpty(allowDelete), SystemEnv.getHtmlLabelName(547426,user.getLanguage()));
 
-            // jobsById.setForbiddenTag(1);
-            //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobsById).sync();
             // 删除拓展表、明细表
             MapperProxyFactory.getProxy(ExtMapper.class).deleteByID("jcl_org_jobext", jobsById.getId());
             MapperProxyFactory.getProxy(ExtDTMapper.class).deleteByMainID("jcl_org_jobext_dt1", jobsById.getId(), null);
@@ -538,7 +516,7 @@ public class JobServiceImpl extends Service implements JobService {
     public List<SearchConditionGroup> getMergeForm(Long id) {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> condition = new ArrayList<>();
-        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "合并到岗位", "666", "targetJob", "");
+        SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547427, "666", "targetJob", "");
         deptBrowserItem.setRules("required");
         BrowserBean browserBean = deptBrowserItem.getBrowserConditionParam();
         String s = JSONObject.toJSONString(browserBean);
@@ -558,8 +536,8 @@ public class JobServiceImpl extends Service implements JobService {
     public int mergeJob(JobMergeParam mergeParam) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         int updateCount = 0;
-        OrganizationAssert.notNull(mergeParam.getTargetJob(), "请选择需要合并的岗位");
-        OrganizationAssert.notBlank(mergeParam.getMergeName(), "请输入合并后的名称");
+        OrganizationAssert.notNull(mergeParam.getTargetJob(), SystemEnv.getHtmlLabelName(547428,user.getLanguage()));
+        OrganizationAssert.notBlank(mergeParam.getMergeName(), SystemEnv.getHtmlLabelName(547270,user.getLanguage()));
 
         // 不可选择岗位本身、以及子岗位
         Set<Long> disableIds = new HashSet<>();
@@ -569,7 +547,7 @@ public class JobServiceImpl extends Service implements JobService {
         if (CollectionUtils.isNotEmpty(jobs)) {
             addDisableIds(disableIds, jobs);
         }
-        OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), "请勿选择当前岗位本身及其子岗位");
+        OrganizationAssert.isFalse(disableIds.contains(mergeParam.getTargetJob()), SystemEnv.getHtmlLabelName(547429,user.getLanguage()));
 
         // 合并到的岗位
         JobPO targetJob = getJobMapper().getJobById(mergeParam.getTargetJob());
@@ -580,20 +558,8 @@ public class JobServiceImpl extends Service implements JobService {
         // 递归处理子岗位所属分部、所部部门、上级岗位
         recursionMergeJob(jobs, targetJob.getEcCompany(), targetJob.getEcDepartment(), targetJob.getId());
 
-        // 人员信息变动，更新分部、部门、岗位
-        // updateResourceJob(jobById, targetJob);
-
-        // 更新合并后的岗位，更新组织架构图
-        // updateEcJob(targetJob, mergeParam.getMergeName());
-
-        //  targetJob.setJobName(mergeParam.getMergeName());
         getJobMapper().updateBaseJob(targetJob);
-        // new JobTriggerRunnable(jobById.getId(), targetJob.getId()).run();
-        // 原岗位删除
-        //new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.CANCELED, null, jobById).sync();
         getJobMapper().deleteByIds(Collections.singletonList(jobById.getId()));
-        // 更新组织架构图
-        // new JobTriggerRunnable(jobById).run();
         return updateCount;
     }
 
@@ -630,10 +596,6 @@ public class JobServiceImpl extends Service implements JobService {
             job.setEcDepartment(ecDepartment);
             job.setParentJob(parentJob);
             getJobMapper().updateBaseJob(job);
-            // 更新人员信息
-            // updateResourceJob(job);
-            // 更新组织架构图
-            // new JobTriggerRunnable(job.getId()).run();
 
             // 递归处理子级元素
             List<JobPO> jobsByPid = getJobMapper().getJobsByPid(job.getId());
@@ -779,7 +741,7 @@ public class JobServiceImpl extends Service implements JobService {
 
             OrganizationAssert.isEmpty(list, SystemEnv.getHtmlLabelName(547137, user.getLanguage()));
         } else {
-            OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), "编号不允许为空");
+            OrganizationAssert.isTrue(null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable()), SystemEnv.getHtmlLabelName(547430,user.getLanguage()));
             jobNo = autoCreateCompanyNo();
         }
         return jobNo;
@@ -813,19 +775,4 @@ public class JobServiceImpl extends Service implements JobService {
         }
     }
 
-    ///**
-    // * 更新EC岗位
-    // *
-    // * @param jobPO
-    // */
-    //private void updateEcJob(JobPO jobPO, String newName) {
-    //    Map<String, Object> params = new HashMap<>();
-    //    params.put("job_name", newName);
-    //    params.put("jobactivityid", JOB_ACTIVITY_ID);
-    //    params.put("work_duty", jobPO.getWorkDuty());
-    //    params.put("work_authority", jobPO.getWorkAuthority());
-    //    params.put("description", jobPO.getDescription());
-    //    params.put("job_no", jobPO.getJobNo());
-    //    new OrganizationSyncEc(user, LogModuleNameEnum.JOB, OperateTypeEnum.UPDATE, params, jobPO).sync();
-    //}
 }

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

@@ -44,14 +44,14 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         List<SearchConditionItem> conditionItems = new ArrayList<>();
 
         // 操作者
-        SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者", "1", "operatorId", "");
+        SearchConditionItem operatorId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547160, "1", "operatorId", "");
         //操作时间
-        SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,"操作时间","operateDate");
+        SearchConditionItem dateItem = OrganizationFormItemUtil.dateItem(user,2,16,true,2,547159,"operateDate");
 
         // 操作者部门
-        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "4", "departmentId", "");
+        SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547167, "4", "departmentId", "");
         // 操作者分部
-        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "164", "companyId", "");
+        SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547168, "164", "companyId", "");
 
         conditionItems.add(operatorId);
         conditionItems.add(dateItem);

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

@@ -4,6 +4,7 @@ import com.engine.core.impl.Service;
 import com.engine.organization.entity.staff.param.StaffOutParam;
 import com.engine.organization.service.StaffOutService;
 import com.engine.organization.util.OrganizationAssert;
+import weaver.systeminfo.SystemEnv;
 
 /**
  * @Author liang.cheng
@@ -16,16 +17,16 @@ public class StaffOutServiceImpl  extends Service implements StaffOutService {
 
     @Override
     public Integer changeStaff(StaffOutParam staffOutParam) {
-        OrganizationAssert.notNull(staffOutParam.getNum(),"调整数量不能为空！");
-        OrganizationAssert.notNull(staffOutParam.getPlanId(),"未指定所属编制方案！");
-        FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl();
+        OrganizationAssert.notNull(staffOutParam.getNum(), SystemEnv.getHtmlLabelName(547466,user.getLanguage()));
+        OrganizationAssert.notNull(staffOutParam.getPlanId(),SystemEnv.getHtmlLabelName(547467,user.getLanguage()));
+        FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(user);
         buildStaffOutParam(staffOutParam);
         return functionFactory.actuator(staffOutParam.getType(), staffOutParam);
     }
 
     @Override
     public Integer transactionOnJob(StaffOutParam staffOutParam) {
-        FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl();
+        FunctionOutStaffServiceImpl functionFactory = new FunctionOutStaffServiceImpl(user);
         buildStaffOutParam(staffOutParam);
         return functionFactory.actuator(staffOutParam.getType(), staffOutParam);
     }

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

@@ -74,9 +74,9 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         String timeEnd = param.getTimeEnd();
         Date startDate = DateUtil.parseToDate(timeStart);
         Date endDate = DateUtil.parseToDate(timeEnd);
-        OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
+        OrganizationAssert.isFalse(startDate.after(endDate), SystemEnv.getHtmlLabelName(547445,user.getLanguage()));
         List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
-        OrganizationAssert.isEmpty(staffPlanPO1,"同一维度下，相同适用公司编制方案的时间段不允许出现交叉");
+        OrganizationAssert.isEmpty(staffPlanPO1,SystemEnv.getHtmlLabelName(547446,user.getLanguage()));
         return getStaffPlanMapper().insertIgnoreNull(staffPlanPO);
     }
 
@@ -95,10 +95,10 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         String timeEnd = param.getTimeEnd();
         Date startDate = DateUtil.parseToDate(timeStart);
         Date endDate = DateUtil.parseToDate(timeEnd);
-        OrganizationAssert.isFalse(startDate.after(endDate), "开始时间不允许在结束时间之后");
+        OrganizationAssert.isFalse(startDate.after(endDate), SystemEnv.getHtmlLabelName(547445,user.getLanguage()));
         List<StaffPlanPO> staffPlanPO1 = getStaffPlanMapper().customSelect(param.getTimeStart(),param.getTimeEnd(), param.getEcCompany(), param.getControlDimension());
         if (staffPlanPO1.size() > 1) {
-            throw new OrganizationRunTimeException("同一维度下，相同适用公司编制方案已存在");
+            throw new OrganizationRunTimeException(SystemEnv.getHtmlLabelName(547458,user.getLanguage()));
         }
         // 多选赋值
         staffPlanPO.setCompanyId(staffPlanPO.getEcCompany());
@@ -129,23 +129,23 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         // 名称
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547141, "planName");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "年度", "planYear");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 546937, "planYear");
         planYearItem.setFormat("YYYY");
         // 时间开始
-        SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间开始", "timeStart");
+        SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547337, "timeStart");
         // 时间结束
-        SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, "时间结束", "timeEnd");
+        SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 2, 547338, "timeEnd");
         // 适用公司
-        SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "适用公司", "164", "ecCompany", "");
+        SearchConditionItem companyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547340, "164", "ecCompany", "");
         // 说明
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547142, "description");
         // 状态
         List<SearchConditionOption> selectOptions = new ArrayList<>();
         SearchConditionOption enableOption = new SearchConditionOption("true", SystemEnv.getHtmlLabelName(547186, user.getLanguage()));
         SearchConditionOption disableOption = new SearchConditionOption("false", SystemEnv.getHtmlLabelName(547192, user.getLanguage()));
         selectOptions.add(enableOption);
         selectOptions.add(disableOption);
-        SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag");
+        SearchConditionItem forbiddenTagItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547130, "forbiddenTag");
 
 
         conditionItems.add(planNoItem);
@@ -174,31 +174,31 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService {
         SearchConditionItem planNameItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, 547141, "planName");
         planNameItem.setRules("required|string");
         // 年度
-        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "年度", "planYear");
+        SearchConditionItem planYearItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 546937, "planYear");
         planYearItem.setFormat("YYYY");
         planYearItem.setRules("required|string");
         // 时间开始
-        SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间开始", "timeStart");
+        SearchConditionItem timeStartItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547337, "timeStart");
         timeStartItem.setRules("required|string");
         // 时间结束
-        SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, "时间结束", "timeEnd");
+        SearchConditionItem timeEndItem = OrganizationFormItemUtil.datePickerItem(user, 2, 16, false, 3, 547338, "timeEnd");
         timeEndItem.setRules("required|string");
         // 适用公司
-        SearchConditionItem ecCompanyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "适用公司", "194", "ecCompany", "compBrowser");
+        SearchConditionItem ecCompanyIdtItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547340, "194", "ecCompany", "compBrowser");
         ecCompanyIdtItem.setRules("required|string");
         List<SearchConditionOption> selectOptions = new ArrayList<>();
-        SearchConditionOption option1 = new SearchConditionOption("1", "分部");
-        SearchConditionOption option2 = new SearchConditionOption("2", "部门");
-        SearchConditionOption option3 = new SearchConditionOption("3", "岗位");
+        SearchConditionOption option1 = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547332,user.getLanguage()));
+        SearchConditionOption option2 = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547331,user.getLanguage()));
+        SearchConditionOption option3 = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547333,user.getLanguage()));
         selectOptions.add(option1);
         selectOptions.add(option2);
         selectOptions.add(option3);
         // 控制维度
-        SearchConditionItem dimensionItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, "控制维度", "controlDimension");
+        SearchConditionItem dimensionItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, true, 547341, "controlDimension");
         dimensionItem.setViewAttr(3);
         dimensionItem.setRules("required|string");
         // 说明
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, "说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 200, 547142, "description");
 
         // 编辑状态下赋值操作
         String id = Util.null2String(params.get("id"));

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

@@ -179,8 +179,6 @@ public class StaffServiceImpl extends Service implements StaffService {
         }
         // 更新主表
         int updateStaff = getStaffMapper().updateStaff(staffPO);
-        // 同步组织架构图编制信息
-        //new StaffTriggerRunnable(staffPO).run();
         return updateStaff;
     }
 
@@ -189,12 +187,7 @@ public class StaffServiceImpl extends Service implements StaffService {
     public int deleteByIds(Collection<Long> ids) {
         HasRightUtil.hasRight(user, RIGHT_NAME, false);
         OrganizationAssert.notEmpty(ids, SystemEnv.getHtmlLabelName(547138,user.getLanguage()));
-        List<StaffPO> staffsByIds = getStaffMapper().getStaffsByIds(ids);
-        int deleteByIds = getStaffMapper().deleteByIds(ids);
-        //for (StaffPO staffsById : staffsByIds) {
-        //    new StaffTriggerRunnable(staffsById).run();
-        //}
-        return deleteByIds;
+        return getStaffMapper().deleteByIds(ids);
     }
 
     @Override
@@ -205,32 +198,31 @@ public class StaffServiceImpl extends Service implements StaffService {
 
 
         // 分部
-        SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "164", "ecCompany", "");
+        SearchConditionItem compIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547332, "164", "ecCompany", "");
         // 部门
-        SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", "");
+        SearchConditionItem deptIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547331, "4", "ecDepartment", "");
         // 岗位
-        SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "666", "jobId", "");
+        SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547333, "666", "jobId", "");
         // 编制数
-        SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "编制数", "staffNum");
+        SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547345, "staffNum");
         // 在编
-        SearchConditionItem permanentNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "在编", "permanentNum");
+        SearchConditionItem permanentNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547346, "permanentNum");
         // 冻结数
-        SearchConditionItem freezeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, "冻结数", "freezeNum");
+        SearchConditionItem freezeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 2, 547347, "freezeNum");
         // 缺编状态
         List<SearchConditionOption> selectOptions = new ArrayList<>();
-        SearchConditionOption lackOption = new SearchConditionOption("1", "缺编");
-        SearchConditionOption fullOption = new SearchConditionOption("2", "满员");
-        SearchConditionOption overOption = new SearchConditionOption("3", "超编");
+        SearchConditionOption lackOption = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547351,user.getLanguage()));
+        SearchConditionOption fullOption = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547350,user.getLanguage()));
+        SearchConditionOption overOption = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547352,user.getLanguage()));
         selectOptions.add(lackOption);
         selectOptions.add(fullOption);
         selectOptions.add(overOption);
-        SearchConditionItem lackStatusItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "缺编状态", "lackStatus");
+        SearchConditionItem lackStatusItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547348, "lackStatus");
         // 编制描述
-        SearchConditionItem staffDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编制描述", "staffDesc");
+        SearchConditionItem staffDescItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547349, "staffDesc");
         // 说明
-        SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "说明", "description");
+        SearchConditionItem descriptionItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, 547142, "description");
 
-        //conditionItems.add(planIdItem);
         conditionItems.add(compIdItem);
         conditionItems.add(deptIdItem);
         conditionItems.add(jobIdItem);
@@ -253,16 +245,16 @@ public class StaffServiceImpl extends Service implements StaffService {
         List<SearchConditionItem> selectItems = new ArrayList<>();
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         // 方案
-        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "方案", "161", "planId", "staffPlanBrowser");
+        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, 547344, "161", "planId", "staffPlanBrowser");
         planIdItem.setRules("required|string");
         planIdItem.setIsQuickSearch(false);
         planIdItem.setEntSearch(false);
         // 分部
-        SearchConditionItem ecCompanyItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "分部", "164", "ecCompany", "compBrowser");
+        SearchConditionItem ecCompanyItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547332, "164", "ecCompany", "compBrowser");
         // 部门
-        SearchConditionItem ecDepartmentItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", "deptBrowser");
+        SearchConditionItem ecDepartmentItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547331, "4", "ecDepartment", "deptBrowser");
         // 岗位
-        SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位", "666", "jobId", "");
+        SearchConditionItem jobIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, 547333, "666", "jobId", "");
         BrowserBean browserBean = jobIdItem.getBrowserConditionParam();
         String s = JSONObject.toJSONString(browserBean);
         CustomBrowserBean customBrowserBean = JSONObject.parseObject(s, CustomBrowserBean.class);
@@ -271,18 +263,18 @@ public class StaffServiceImpl extends Service implements StaffService {
         jobIdItem.setBrowserConditionParam(customBrowserBean);
 
         // 编制数
-        SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "编制数", "staffNum");
+        SearchConditionItem staffNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, 547345, "staffNum");
         staffNumItem.setRules("required");
         staffNumItem.setMin("0");
         // 控制策略
         List<SearchConditionOption> selectOptions = new ArrayList<>();
-        SearchConditionOption option1 = new SearchConditionOption("1", "弱控");
-        SearchConditionOption option2 = new SearchConditionOption("2", "强控");
-        SearchConditionOption option3 = new SearchConditionOption("3", "不控");
+        SearchConditionOption option1 = new SearchConditionOption("1", SystemEnv.getHtmlLabelName(547454,user.getLanguage()));
+        SearchConditionOption option2 = new SearchConditionOption("2", SystemEnv.getHtmlLabelName(547455,user.getLanguage()));
+        SearchConditionOption option3 = new SearchConditionOption("3", SystemEnv.getHtmlLabelName(547456,user.getLanguage()));
         selectOptions.add(option1);
         selectOptions.add(option2);
         selectOptions.add(option3);
-        SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, "控制策略", "controlPolicy");
+        SearchConditionItem controlPolicyItem = OrganizationFormItemUtil.selectItem(user, selectOptions, 2, 16, 6, false, 547457, "controlPolicy");
         controlPolicyItem.setViewAttr(3);
         controlPolicyItem.setValue("1");
         controlPolicyItem.setRules("required|string");
@@ -340,11 +332,11 @@ public class StaffServiceImpl extends Service implements StaffService {
                 item.setViewAttr(1);
                 item.setRules(null);
             });
-            SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, "调整数量", "changeNum");
-            changeNumItem.setHelpfulTip("提示:正数为增加，负数为减少编制数");
+            SearchConditionItem changeNumItem = OrganizationFormItemUtil.inputNumberItem(user, 2, 16, 3, 547357, "changeNum");
+            changeNumItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547359,user.getLanguage()));
             staffNumItem.setRules("required");
             selectItems.add(changeNumItem);
-            SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, "变更说明", "changeDescription");
+            SearchConditionItem changeDescriptionItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, false, 2, 50, 547358, "changeDescription");
             selectItems.add(changeDescriptionItem);
 
         }
@@ -363,9 +355,9 @@ public class StaffServiceImpl extends Service implements StaffService {
         List<SearchConditionGroup> addGroups = new ArrayList<>();
         List<SearchConditionItem> selectItems = new ArrayList<>();
         // 方案
-        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, "编制方案", "162", "planId", "staffPlanBrowser");
+        SearchConditionItem planIdItem = OrganizationFormItemUtil.browserItem(user, 4, 3, 2, false, 547459, "162", "planId", "staffPlanBrowser");
         planIdItem.setRules("required|string");
-        planIdItem.setHelpfulTip("请选择编制方案后查看数据");
+        planIdItem.setHelpfulTip(SystemEnv.getHtmlLabelName(547343,user.getLanguage()));
         planIdItem.setLabelcol(2);
 
         selectItems.add(planIdItem);
@@ -456,11 +448,11 @@ public class StaffServiceImpl extends Service implements StaffService {
         StaffPlanPO staffPlanByID = getStaffPlanMapper().getStaffPlanByID(staffPO.getPlanId());
         switch (staffPlanByID.getControlDimension()) {
             case "1":// 分部
-                OrganizationAssert.notNull(staffPO.getEcCompany(), "编制维度选择分部时，分部必填！");
+                OrganizationAssert.notNull(staffPO.getEcCompany(), SystemEnv.getHtmlLabelName(547461,user.getLanguage()));
                 staffPO.setCompId(staffPO.getEcCompany());
                 break;
             case "2":// 部门
-                OrganizationAssert.notNull(staffPO.getEcDepartment(), "编制维度选择部门时，部门必填！");
+                OrganizationAssert.notNull(staffPO.getEcDepartment(), SystemEnv.getHtmlLabelName(547460,user.getLanguage()));
                 DepartmentPO jclDepartmentId = getDepartmentMapper().getDeptById(staffPO.getEcDepartment());
                 if (null != jclDepartmentId) {
                     staffPO.setDeptId(jclDepartmentId.getId());
@@ -469,7 +461,7 @@ public class StaffServiceImpl extends Service implements StaffService {
                 }
                 break;
             case "3": // 岗位
-                OrganizationAssert.notNull(staffPO.getJobId(), "编制维度选择岗位时，岗位必填！");
+                OrganizationAssert.notNull(staffPO.getJobId(), SystemEnv.getHtmlLabelName(547462,user.getLanguage()));
                 JobPO jobById = getJobMapper().getJobById(Long.valueOf(staffPO.getJobId()));
                 if (null != jobById) {
                     staffPO.setDeptId(jobById.getEcDepartment());

src/com/engine/organization/util/OrganizationFormItemUtil.java

@@ -101,6 +101,11 @@ public class OrganizationFormItemUtil {
         return inputnumber;
     }
 
+    public static SearchConditionItem inputNumberItem(User user, int colSpan, int fieldcol,
+                                                      int viewAttr, int label, String name) {
+        return inputNumberItem(user,colSpan,fieldcol,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
+    }
+
 
     /**
      * 输入框文本
@@ -295,6 +300,11 @@ public class OrganizationFormItemUtil {
         return date;
     }
 
+    public static SearchConditionItem dateItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
+                                               int viewAttr, int label, String name) {
+        return dateItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
+    }
+
     /**
      * @param user
      * @param colSpan
@@ -317,6 +327,11 @@ public class OrganizationFormItemUtil {
         return datePicker;
     }
 
+    public static SearchConditionItem datePickerItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
+                                                     int viewAttr, int label, String name) {
+        return datePickerItem(user,colSpan,fieldcol,isQuickSearch,viewAttr,SystemEnv.getHtmlLabelName(label,user.getLanguage()),name);
+    }
+
 
     public static SearchConditionItem dateGroupItem(User user, int colSpan, int fieldcol, boolean isQuickSearch,
                                                     int viewAttr, String label, String name) {

src/com/engine/organization/util/response/ReturnResult.java

@@ -103,8 +103,8 @@ public class ReturnResult<T> implements Serializable {
     /**
      * 返回默认状态
      */
-    public static <T> ReturnResult<T> successed() {
-        return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage());
+    public static <T> ReturnResult<T> successed(User user) {
+        return new ReturnResult<>(ResultCode.SUCCESS.getCode(), SystemEnv.getHtmlLabelName(ResultCode.SUCCESS.getLabelId(), user.getLanguage()));
     }
 
     /**
@@ -113,11 +113,11 @@ public class ReturnResult<T> implements Serializable {
      * @param data
      * @return
      */
-    @Deprecated
-    public static <T> ReturnResult<T> successed(T data) {
-
-        return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
-    }
+    //@Deprecated
+    //public static <T> ReturnResult<T> successed(T data) {
+    //
+    //    return new ReturnResult<>(ResultCode.SUCCESS.getCode(), ResultCode.SUCCESS.getMessage(), data);
+    //}
 
     /**
      * 多语言响应

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

@@ -37,7 +37,7 @@ public class CardAccessController {
     public ReturnResult hasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCardAccessWrapper(user).hasRight());
+            return ReturnResult.successed(user,getCardAccessWrapper(user).hasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -49,7 +49,7 @@ public class CardAccessController {
     public ReturnResult listPage(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCardAccessWrapper(user).listPage());
+            return ReturnResult.successed(user,getCardAccessWrapper(user).listPage());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -62,7 +62,7 @@ public class CardAccessController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCardAccessWrapper(user).save(map));
+            return ReturnResult.successed(user,getCardAccessWrapper(user).save(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -74,7 +74,7 @@ public class CardAccessController {
     public ReturnResult getCardButtonTable(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCardAccessWrapper(user).getCardButtonTable());
+            return ReturnResult.successed(user,getCardAccessWrapper(user).getCardButtonTable());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -87,7 +87,7 @@ public class CardAccessController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCardAccessWrapper(user).saveCardButton(map));
+            return ReturnResult.successed(user,getCardAccessWrapper(user).saveCardButton(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -46,7 +46,7 @@ public class CompController {
     public ReturnResult listComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).listPage(params));
+            return ReturnResult.successed(user,getCompWrapper(user).listPage(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -66,7 +66,7 @@ public class CompController {
     public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).saveBaseComp(ParamUtil.request2Map(request)));
+            return ReturnResult.successed(user,getCompWrapper(user).saveBaseComp(ParamUtil.request2Map(request)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -86,7 +86,7 @@ public class CompController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody CompParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getCompWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -106,7 +106,7 @@ public class CompController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCompWrapper(user).updateComp(map));
+            return ReturnResult.successed(user,getCompWrapper(user).updateComp(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -126,7 +126,7 @@ public class CompController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getCompWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class CompController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).getSearchCondition());
+            return ReturnResult.successed(user,getCompWrapper(user).getSearchCondition());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -164,7 +164,7 @@ public class CompController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getCompWrapper(user).getHasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -184,7 +184,7 @@ public class CompController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCompWrapper(user).getCompBaseForm(params));
+            return ReturnResult.successed(user,getCompWrapper(user).getCompBaseForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -205,7 +205,7 @@ public class CompController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getCompWrapper(user).getCompSaveForm(params));
+            return ReturnResult.successed(user,getCompWrapper(user).getCompSaveForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -217,7 +217,7 @@ public class CompController {
     public ReturnResult getMoveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).getMoveForm());
+            return ReturnResult.successed(user,getCompWrapper(user).getMoveForm());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -229,7 +229,7 @@ public class CompController {
     public ReturnResult moveCompany(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMoveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getCompWrapper(user).moveCompany(param));
+            return ReturnResult.successed(user,getCompWrapper(user).moveCompany(param));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -1,7 +1,6 @@
 package com.engine.organization.web;
 
 import com.engine.common.util.ServiceUtil;
-import com.engine.organization.entity.config.dto.EditTableDatas;
 import com.engine.organization.entity.config.params.QTXConfigParam;
 import com.engine.organization.entity.config.po.QTXConfigPO;
 import com.engine.organization.service.ConfigService;
@@ -55,7 +54,7 @@ public class ConfigController {
     public ReturnResult selectConfigInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getConfigService(user).selectConfigInfo());
+            return ReturnResult.successed(user,getConfigService(user).selectConfigInfo());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -72,7 +71,7 @@ public class ConfigController {
             String isopenconfig = request.getParameter("isopenconfig");
             ObjectMapper objectMapper = new ObjectMapper();
             QTXConfigPO qtxConfigPO = objectMapper.readValue(editTable, QTXConfigPO.class);
-            return ReturnResult.successed(getConfigService(user).saveConfigInfo(qtxConfigPO,isopenconfig));
+            return ReturnResult.successed(user,getConfigService(user).saveConfigInfo(qtxConfigPO,isopenconfig));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -56,7 +56,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             String parentDept = (String) map.get("parentDept");
-            return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Integer.parseInt(parentDept)).build()));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Integer.parseInt(parentDept)).build()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -94,7 +94,7 @@ public class DepartmentController {
     public ReturnResult listDept(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptSearchParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).listPage(params));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).listPage(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -114,7 +114,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).saveBaseForm(params));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -134,7 +134,7 @@ public class DepartmentController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -154,7 +154,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).updateForm(map));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).updateForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -175,7 +175,7 @@ public class DepartmentController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -195,7 +195,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -214,7 +214,7 @@ public class DepartmentController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getHasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -234,7 +234,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).getDeptBaseForm(map));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getDeptBaseForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -254,7 +254,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).getSaveForm(params));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getSaveForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -267,7 +267,7 @@ public class DepartmentController {
     public ReturnResult getCopyForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).getCopyForm());
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getCopyForm());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -279,7 +279,7 @@ public class DepartmentController {
     public ReturnResult copyDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeptCopyParam copyParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).copyDepartment(copyParam));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).copyDepartment(copyParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -291,7 +291,7 @@ public class DepartmentController {
     public ReturnResult getMergeForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).getMergeForm());
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getMergeForm());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -303,7 +303,7 @@ public class DepartmentController {
     public ReturnResult mergeDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMergeParam mergeParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).mergeDepartment(mergeParam));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).mergeDepartment(mergeParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -315,7 +315,7 @@ public class DepartmentController {
     public ReturnResult getMoveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).getMoveForm());
+            return ReturnResult.successed(user,getDepartmentWrapper(user).getMoveForm());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -327,7 +327,7 @@ public class DepartmentController {
     public ReturnResult moveDepartment(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DepartmentMoveParam moveParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getDepartmentWrapper(user).moveDepartment(moveParam));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).moveDepartment(moveParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -339,7 +339,7 @@ public class DepartmentController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getDepartmentWrapper(user).dragDepartment(departmentDragParam));
+            return ReturnResult.successed(user,getDepartmentWrapper(user).dragDepartment(departmentDragParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -93,7 +93,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             String groupType = (String) map.get("groupType");
-            return ReturnResult.successed(getFieldDefinedWrapper(user).getTabInfo(groupType));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).getTabInfo(groupType));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -113,7 +113,7 @@ public class FieldDefinedController {
     public ReturnResult saveGroup(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getFieldDefinedWrapper(user).saveGroup(param));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveGroup(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -133,7 +133,7 @@ public class FieldDefinedController {
     public ReturnResult saveTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getFieldDefinedWrapper(user).saveTitle(param));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveTitle(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class FieldDefinedController {
     public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).deleteTitle(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -157,7 +157,7 @@ public class FieldDefinedController {
     public ReturnResult saveFields(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData()));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).saveFields(param.getData()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -172,7 +172,7 @@ public class FieldDefinedController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             Long groupType = Long.parseLong((String) map.get("groupType"));
             Long groupId = Long.parseLong((String) map.get("groupId"));
-            return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build()));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -185,7 +185,7 @@ public class FieldDefinedController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             getFieldDefinedWrapper(user).deleteFieldDefined(param);
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -198,7 +198,7 @@ public class FieldDefinedController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             getFieldDefinedWrapper(user).changeGroup(param);
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -210,7 +210,7 @@ public class FieldDefinedController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getFieldDefinedWrapper(user).getHasRight(moduleTypeEnum));
+            return ReturnResult.successed(user,getFieldDefinedWrapper(user).getHasRight(moduleTypeEnum));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -44,7 +44,7 @@ public class GradeController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getGradeWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getGradeWrapper(user).listPage(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -63,7 +63,7 @@ public class GradeController {
     public ReturnResult saveGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).saveGrade(param));
+            return ReturnResult.successed(user,getGradeWrapper(user).saveGrade(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -83,7 +83,7 @@ public class GradeController {
     public ReturnResult updateGrade(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).updateGrade(param));
+            return ReturnResult.successed(user,getGradeWrapper(user).updateGrade(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -103,7 +103,7 @@ public class GradeController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody GradeSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getGradeWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -124,7 +124,7 @@ public class GradeController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getGradeWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -144,7 +144,7 @@ public class GradeController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getGradeWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getGradeWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -166,7 +166,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             //String s = Util.null2String(map.get(ParamConstant.PARAM_IP));
-            return ReturnResult.successed(getGradeWrapper(user).getGradeForm(map));
+            return ReturnResult.successed(user,getGradeWrapper(user).getGradeForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -185,7 +185,7 @@ public class GradeController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getGradeWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -197,7 +197,7 @@ public class GradeController {
     public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).getTabInfo());
+            return ReturnResult.successed(user,getGradeWrapper(user).getTabInfo());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -210,7 +210,7 @@ public class GradeController {
                                    @QueryParam("id")Long id) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGradeWrapper(user).getLevelId(id));
+            return ReturnResult.successed(user,getGradeWrapper(user).getLevelId(id));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -43,7 +43,7 @@ public class GroupController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getGroupWrapper(user).getGroupFormField(map));
+            return ReturnResult.successed(user,getGroupWrapper(user).getGroupFormField(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -55,7 +55,7 @@ public class GroupController {
     public ReturnResult updateGroup(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map<String, Object> map) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGroupWrapper(user).updateGroup(map));
+            return ReturnResult.successed(user,getGroupWrapper(user).updateGroup(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -74,7 +74,7 @@ public class GroupController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGroupWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getGroupWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -86,7 +86,7 @@ public class GroupController {
     public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getGroupWrapper(user).getTabInfo());
+            return ReturnResult.successed(user,getGroupWrapper(user).getTabInfo());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -67,7 +67,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).listPage(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -86,7 +86,7 @@ public class HrmResourceController {
     public ReturnResult getSaveForm(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getHrmResourceWrapper(user).getSaveForm());
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).getSaveForm());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -105,7 +105,7 @@ public class HrmResourceController {
     public ReturnResult saveBaseForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map<String, Object> params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getHrmResourceWrapper(user).saveBaseForm(params));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -125,7 +125,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).getBaseForm(map));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).getBaseForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).updateForm(map));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).updateForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -165,7 +165,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getSearchCondition(map)));
+            return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getSearchCondition(map)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -179,7 +179,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Integer templateId = getHrmResourceWrapper(user).saveSearchTemplate(params);
-            return ReturnResult.successed(Util.null2String(templateId));
+            return ReturnResult.successed(user,Util.null2String(templateId));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -192,7 +192,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             getHrmResourceWrapper(user).deleteSearchTemplate(params.getId());
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -205,7 +205,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getTemplateSelectKeys(map)));
+            return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getTemplateSelectKeys(map)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -218,7 +218,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getSearchTemplate(map)));
+            return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getSearchTemplate(map)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -237,7 +237,7 @@ public class HrmResourceController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).getHasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -250,7 +250,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).getTabForm(map));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).getTabForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -262,7 +262,7 @@ public class HrmResourceController {
     public ReturnResult saveTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getHrmResourceWrapper(user).saveTabForm(params));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).saveTabForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -274,7 +274,7 @@ public class HrmResourceController {
     public ReturnResult updateTabForm(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmRelationSaveParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getHrmResourceWrapper(user).updateTabForm(params));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).updateTabForm(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -287,7 +287,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params);
-            return ReturnResult.successed(Util.null2String(templateId));
+            return ReturnResult.successed(user,Util.null2String(templateId));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -300,7 +300,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             getHrmResourceWrapper(user).deleteCustomTemplate(params.getId());
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -313,7 +313,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(JSON.toJSON(getHrmResourceWrapper(user).getCustomTransferData(map)));
+            return ReturnResult.successed(user,JSON.toJSON(getHrmResourceWrapper(user).getCustomTransferData(map)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -332,7 +332,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).getCustomTemplate(params));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).getCustomTemplate(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -352,7 +352,7 @@ public class HrmResourceController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             Integer templateId = getHrmResourceWrapper(user).updateCustomTemplate(map);
-            return ReturnResult.successed(Util.null2String(templateId));
+            return ReturnResult.successed(user,Util.null2String(templateId));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -368,7 +368,7 @@ public class HrmResourceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String,Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getHrmResourceWrapper(user).saveColumnsCustomTemplate(map));
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).saveColumnsCustomTemplate(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -38,7 +38,7 @@ public class ImportCommonController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             String importType = (String) map.get("importType");
-            return ReturnResult.successed(getImportCommonWrapper(user).getImportFields(importType));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).getImportFields(importType));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -54,7 +54,7 @@ public class ImportCommonController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             String importType = (String) map.get("importType");
             String columns = (String) map.get("columns");
-            return ReturnResult.successed(getImportCommonWrapper(user).getImportForm(importType, columns));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).getImportForm(importType, columns));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -67,7 +67,7 @@ public class ImportCommonController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getImportCommonWrapper(user).saveImport(map, request));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).saveImport(map, request));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -81,7 +81,7 @@ public class ImportCommonController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getImportCommonWrapper(user).getImportResult(map));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).getImportResult(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -93,7 +93,7 @@ public class ImportCommonController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getImportCommonWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getImportCommonWrapper(user).getHasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -106,7 +106,7 @@ public class ImportCommonController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getImportCommonWrapper(user).saveCommonImport(map));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).saveCommonImport(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -119,7 +119,7 @@ public class ImportCommonController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getImportCommonWrapper(user).getCommonForm(Util.null2String(map.get("importModule"))));
+            return ReturnResult.successed(user,getImportCommonWrapper(user).getCommonForm(Util.null2String(map.get("importModule"))));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -37,7 +37,7 @@ public class JclOrgController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             String id = Util.null2String(map.get("id"));
             String type = Util.null2String(map.get("type"));
-            return ReturnResult.successed(getJclOrgWrapper(user).getJclOrgId(id, type));
+            return ReturnResult.successed(user,getJclOrgWrapper(user).getJclOrgId(id, type));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -52,7 +52,7 @@ public class JclOrgController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             String id = Util.null2String(map.get("id"));
             String type = Util.null2String(map.get("type"));
-            return ReturnResult.successed(getJclOrgWrapper(user).getEcOrgId(id, type));
+            return ReturnResult.successed(user,getJclOrgWrapper(user).getEcOrgId(id, type));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -67,7 +67,7 @@ public class JclOrgController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             String id = Util.null2String(map.get("id"));
             getJclOrgWrapper(user).syncCusFieldData(id);
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -82,7 +82,7 @@ public class JclOrgController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             String id = Util.null2String(map.get("id"));
             getJclOrgWrapper(user).supplementResourceInfo(Integer.parseInt(id));
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -66,7 +66,7 @@ public class JobController {
     public ReturnResult listDept(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).listPage(params));
+            return ReturnResult.successed(user,getJobWrapper(user).listPage(params));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -87,7 +87,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             JobSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), JobSearchParam.class);
-            return ReturnResult.successed(getJobWrapper(user).getSaveForm(param));
+            return ReturnResult.successed(user,getJobWrapper(user).getSaveForm(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -107,7 +107,7 @@ public class JobController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getJobWrapper(user).getJobBaseForm(map));
+            return ReturnResult.successed(user,getJobWrapper(user).getJobBaseForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -127,7 +127,7 @@ public class JobController {
     public ReturnResult saveBaseComp(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Map<String, Object> params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).saveBaseForm(params));
+            return ReturnResult.successed(user,getJobWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -147,7 +147,7 @@ public class JobController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getJobWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -167,7 +167,7 @@ public class JobController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getJobWrapper(user).updateForm(map));
+            return ReturnResult.successed(user,getJobWrapper(user).updateForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -187,7 +187,7 @@ public class JobController {
     public ReturnResult copyJobItem(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobCopyParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).copyJobItem(param));
+            return ReturnResult.successed(user,getJobWrapper(user).copyJobItem(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -207,7 +207,7 @@ public class JobController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getJobWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -226,7 +226,7 @@ public class JobController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getJobWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -239,7 +239,7 @@ public class JobController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             getJobWrapper(user).refresh();
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -258,7 +258,7 @@ public class JobController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).getSearchCondition());
+            return ReturnResult.successed(user,getJobWrapper(user).getSearchCondition());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -302,7 +302,7 @@ public class JobController {
             if (StringUtils.isBlank(id)) {
                 id = "0";
             }
-            return ReturnResult.successed(getJobWrapper(user).getMergeForm(Long.parseLong(id)));
+            return ReturnResult.successed(user,getJobWrapper(user).getMergeForm(Long.parseLong(id)));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -314,7 +314,7 @@ public class JobController {
     public ReturnResult mergeJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody JobMergeParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getJobWrapper(user).mergeJob(param));
+            return ReturnResult.successed(user,getJobWrapper(user).mergeJob(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -45,7 +45,7 @@ public class LevelController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getLevelWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getLevelWrapper(user).listPage(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -64,7 +64,7 @@ public class LevelController {
     public ReturnResult saveLevel(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).saveLevel(param));
+            return ReturnResult.successed(user,getLevelWrapper(user).saveLevel(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -84,7 +84,7 @@ public class LevelController {
     public ReturnResult updateLevel(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).updateLevel(param));
+            return ReturnResult.successed(user,getLevelWrapper(user).updateLevel(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -104,7 +104,7 @@ public class LevelController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody LevelSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getLevelWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -125,7 +125,7 @@ public class LevelController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getLevelWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class LevelController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getLevelWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getLevelWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -166,7 +166,7 @@ public class LevelController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getLevelWrapper(user).getLevelForm(map));
+            return ReturnResult.successed(user,getLevelWrapper(user).getLevelForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -185,7 +185,7 @@ public class LevelController {
     public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).getTableBtn());
+            return ReturnResult.successed(user,getLevelWrapper(user).getTableBtn());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -197,7 +197,7 @@ public class LevelController {
     public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).getTabInfo());
+            return ReturnResult.successed(user,getLevelWrapper(user).getTabInfo());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -209,7 +209,7 @@ public class LevelController {
     public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLevelWrapper(user).getTreeData());
+            return ReturnResult.successed(user,getLevelWrapper(user).getTreeData());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -38,7 +38,7 @@ public class LogViewController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             LogViewSearchParam params = JSONObject.toJavaObject((JSON) JSON.toJSON(map), LogViewSearchParam.class);
-            return ReturnResult.successed(getLogViewWrapper(user).listPage(params));
+            return ReturnResult.successed(user,getLogViewWrapper(user).listPage(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -51,7 +51,7 @@ public class LogViewController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getLogViewWrapper(user).getSearchCondition());
+            return ReturnResult.successed(user,getLogViewWrapper(user).getSearchCondition());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -37,7 +37,7 @@ public class ManagerDetachController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getManagerDetachWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).listPage(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -50,7 +50,7 @@ public class ManagerDetachController {
     public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).getTableBtn());
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).getTableBtn());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -63,7 +63,7 @@ public class ManagerDetachController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).getSearchCondition());
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).getSearchCondition());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -76,7 +76,7 @@ public class ManagerDetachController {
                                       @QueryParam("id") Integer id) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).getForm(id));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).getForm(id));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -88,7 +88,7 @@ public class ManagerDetachController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -101,7 +101,7 @@ public class ManagerDetachController {
     public ReturnResult saveDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).save(param));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).save(param));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -113,7 +113,7 @@ public class ManagerDetachController {
     public ReturnResult updateDetach(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ManagerDetachParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).updateDetach(param));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).updateDetach(param));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -126,7 +126,7 @@ public class ManagerDetachController {
                                  @QueryParam("idDetach") String isDetach) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getManagerDetachWrapper(user).doDetach(isDetach));
+            return ReturnResult.successed(user,getManagerDetachWrapper(user).doDetach(isDetach));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -37,7 +37,7 @@ public class NonStandardOptController {
             String method = Util.null2String(map.get("method"));
             String ids = Util.null2String(map.get("ids"));
             getNonStandardOptWrapper(user).NonStandardOpt(method, ids);
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -284,7 +284,7 @@ public class OrgChartController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getOrgChartWrapper(user).synchronousData(params));
+            return ReturnResult.successed(user,getOrgChartWrapper(user).synchronousData(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -298,7 +298,7 @@ public class OrgChartController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getOrgChartWrapper(user).selectStatistics(params));
+            return ReturnResult.successed(user,getOrgChartWrapper(user).selectStatistics(params));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -311,7 +311,7 @@ public class OrgChartController {
     public ReturnResult recordStatistics(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StatisticsParam statisticsParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getOrgChartWrapper(user).recordStatistics(statisticsParam));
+            return ReturnResult.successed(user,getOrgChartWrapper(user).recordStatistics(statisticsParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -34,7 +34,7 @@ public class OrgVirtualController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getVirtualWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getVirtualWrapper(user).listPage(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -36,7 +36,7 @@ public class PersonnelCardController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             String id = Util.null2String(map.get("id"));
-            return ReturnResult.successed(getPersonnelCardWrapper(user).getPersonnelCard(StringUtils.isBlank(id) ? null : Long.parseLong(id)));
+            return ReturnResult.successed(user,getPersonnelCardWrapper(user).getPersonnelCard(StringUtils.isBlank(id) ? null : Long.parseLong(id)));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -48,7 +48,7 @@ public class PersonnelCardController {
     public ReturnResult getIframeList(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPersonnelCardWrapper(user).getIframeList());
+            return ReturnResult.successed(user,getPersonnelCardWrapper(user).getIframeList());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -19,12 +19,12 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import javax.ws.rs.core.Response;
-import java.io.*;
-import java.net.URLEncoder;
 import java.util.Map;
 
 /**
@@ -60,7 +60,7 @@ public class PersonnelResumeController {
     public ReturnResult hasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPersonnelResumeWrapper(user).hasRight());
+            return ReturnResult.successed(user,getPersonnelResumeWrapper(user).hasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -75,7 +75,7 @@ public class PersonnelResumeController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             Integer uId = Integer.parseInt(Util.null2String(map.get("id")));
-            return ReturnResult.successed(getPersonnelResumeWrapper(user).getResumeList(uId));
+            return ReturnResult.successed(user,getPersonnelResumeWrapper(user).getResumeList(uId));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -92,7 +92,7 @@ public class PersonnelResumeController {
             List<SearchConditionGroup> addGroups = new ArrayList<>();
             addGroups.add(new SearchConditionGroup("高级搜索条件", true, getPersonnelResumeWrapper(user).personnelScreening()));
             returnMap.put("conditions",addGroups);
-            return ReturnResult.successed(returnMap);
+            return ReturnResult.successed(user,returnMap);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -46,7 +46,7 @@ public class PostController {
     public ReturnResult savePost(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostPO postPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostWrapper(user).savePost(postPO));
+            return ReturnResult.successed(user,getPostWrapper(user).savePost(postPO));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -66,7 +66,7 @@ public class PostController {
     public ReturnResult updatePost(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostPO postPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostWrapper(user).updatePost(postPO));
+            return ReturnResult.successed(user,getPostWrapper(user).updatePost(postPO));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -87,7 +87,7 @@ public class PostController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getPostWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -108,7 +108,7 @@ public class PostController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getPostWrapper(user).getPostForm(map));
+            return ReturnResult.successed(user,getPostWrapper(user).getPostForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -126,7 +126,7 @@ public class PostController {
     public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostWrapper(user).getTreeData());
+            return ReturnResult.successed(user,getPostWrapper(user).getTreeData());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -45,7 +45,7 @@ public class PostInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getPostInfoWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).listPage(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -64,7 +64,7 @@ public class PostInfoController {
     public ReturnResult savePostInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostInfoWrapper(user).savePostInfo(param));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).savePostInfo(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -84,7 +84,7 @@ public class PostInfoController {
     public ReturnResult updatePostInfo(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostInfoWrapper(user).updatePostInfo(param));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).updatePostInfo(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -104,7 +104,7 @@ public class PostInfoController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody PostInfoSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostInfoWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -125,7 +125,7 @@ public class PostInfoController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostInfoWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class PostInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getPostInfoWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -166,7 +166,7 @@ public class PostInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getPostInfoWrapper(user).getPostInfoForm(map));
+            return ReturnResult.successed(user,getPostInfoWrapper(user).getPostInfoForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -185,7 +185,7 @@ public class PostInfoController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getPostInfoWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getPostInfoWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -34,7 +34,7 @@ public class QuickSearchController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchCondition(map));
+            return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchCondition(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -47,7 +47,7 @@ public class QuickSearchController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchInfo(map));
+            return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -60,7 +60,7 @@ public class QuickSearchController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getQuickSearchWrapper(user).saveQuickSearchInfo(map));
+            return ReturnResult.successed(user,getQuickSearchWrapper(user).saveQuickSearchInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -73,7 +73,7 @@ public class QuickSearchController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getQuickSearchWrapper(user).getQuickSearchDetailInfo(map));
+            return ReturnResult.successed(user,getQuickSearchWrapper(user).getQuickSearchDetailInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -86,7 +86,7 @@ public class QuickSearchController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getQuickSearchWrapper(user).saveQuickSearchDetailInfo(map));
+            return ReturnResult.successed(user,getQuickSearchWrapper(user).saveQuickSearchDetailInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -39,7 +39,7 @@ public class ResourceBasicInfoController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getHasRight());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -53,7 +53,7 @@ public class ResourceBasicInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getResourceBasicInfo(map));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getResourceBasicInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -66,7 +66,7 @@ public class ResourceBasicInfoController {
     public ReturnResult getTreeData(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getTreeData());
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getTreeData());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -79,7 +79,7 @@ public class ResourceBasicInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getForm(map));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -92,7 +92,7 @@ public class ResourceBasicInfoController {
     public ReturnResult delete(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -105,7 +105,7 @@ public class ResourceBasicInfoController {
     public ReturnResult recover(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).recoverByIds(param.getIds()));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).recoverByIds(param.getIds()));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -117,7 +117,7 @@ public class ResourceBasicInfoController {
     public ReturnResult save(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).save(resourceItemPO));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).save(resourceItemPO));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -129,7 +129,7 @@ public class ResourceBasicInfoController {
     public ReturnResult update(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemPO resourceItemPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).update(resourceItemPO));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).update(resourceItemPO));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -142,7 +142,7 @@ public class ResourceBasicInfoController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getItemClassForm(map));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getItemClassForm(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -154,7 +154,7 @@ public class ResourceBasicInfoController {
     public ReturnResult saveResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).saveResourceItemClass(resourceItemClassPO));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).saveResourceItemClass(resourceItemClassPO));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -166,7 +166,7 @@ public class ResourceBasicInfoController {
     public ReturnResult updateResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody ResourceItemClassPO resourceItemClassPO) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).updateResourceItemClass(resourceItemClassPO));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).updateResourceItemClass(resourceItemClassPO));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -178,7 +178,7 @@ public class ResourceBasicInfoController {
     public ReturnResult deleteResourceItemClass(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Integer fid) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).deleteResourceItemClass(fid));
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).deleteResourceItemClass(fid));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -190,7 +190,7 @@ public class ResourceBasicInfoController {
     public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getSearchCondition());
+            return ReturnResult.successed(user,getResourceBasicInfoWrapper(user).getSearchCondition());
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -45,7 +45,7 @@ public class SequenceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSequenceWrapper(user).listPage(map));
+            return ReturnResult.successed(user,getSequenceWrapper(user).listPage(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -64,7 +64,7 @@ public class SequenceController {
     public ReturnResult saveSequence(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).saveSequence(param));
+            return ReturnResult.successed(user,getSequenceWrapper(user).saveSequence(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -84,7 +84,7 @@ public class SequenceController {
     public ReturnResult updateSequence(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).updateSequence(param));
+            return ReturnResult.successed(user,getSequenceWrapper(user).updateSequence(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -104,7 +104,7 @@ public class SequenceController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SequenceSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getSequenceWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -125,7 +125,7 @@ public class SequenceController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getSequenceWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -145,7 +145,7 @@ public class SequenceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSequenceWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getSequenceWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -166,7 +166,7 @@ public class SequenceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSequenceWrapper(user).getSequenceForm(map));
+            return ReturnResult.successed(user,getSequenceWrapper(user).getSequenceForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -185,7 +185,7 @@ public class SequenceController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getSequenceWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -197,7 +197,7 @@ public class SequenceController {
     public ReturnResult getTabInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getSequenceWrapper(user).getTabInfo());
+            return ReturnResult.successed(user,getSequenceWrapper(user).getTabInfo());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -210,7 +210,7 @@ public class SequenceController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getSequenceWrapper(user).getSchemeInfo(map));
+            return ReturnResult.successed(user,getSequenceWrapper(user).getSchemeInfo(map));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -49,7 +49,7 @@ public class StaffController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             StaffSerachParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffSerachParam.class);
-            return ReturnResult.successed(getStaffWrapper(user).listPage(param));
+            return ReturnResult.successed(user,getStaffWrapper(user).listPage(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -68,7 +68,7 @@ public class StaffController {
     public ReturnResult saveStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffWrapper(user).saveStaff(param));
+            return ReturnResult.successed(user,getStaffWrapper(user).saveStaff(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -88,7 +88,7 @@ public class StaffController {
     public ReturnResult updateStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffParams param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffWrapper(user).updateStaff(param));
+            return ReturnResult.successed(user,getStaffWrapper(user).updateStaff(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -109,7 +109,7 @@ public class StaffController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getStaffWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -129,7 +129,7 @@ public class StaffController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getStaffWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getStaffWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -150,7 +150,7 @@ public class StaffController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getStaffWrapper(user).getForm(map));
+            return ReturnResult.successed(user,getStaffWrapper(user).getForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -169,7 +169,7 @@ public class StaffController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getStaffWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -36,7 +36,7 @@ public class StaffOutController {
     public ReturnResult changeStaff(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(staffOutService(user).changeStaff(staffOutParam));
+            return ReturnResult.successed(user,staffOutService(user).changeStaff(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -48,7 +48,7 @@ public class StaffOutController {
     public ReturnResult transactionOnJob(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffOutParam staffOutParam) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(staffOutService(user).transactionOnJob(staffOutParam));
+            return ReturnResult.successed(user,staffOutService(user).transactionOnJob(staffOutParam));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -48,7 +48,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
             StaffPlanSearchParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffPlanSearchParam.class);
-            return ReturnResult.successed(getStaffPlanWrapper(user).listPage(param));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).listPage(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -67,7 +67,7 @@ public class StaffPlanController {
     public ReturnResult saveStaffPlan(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffPlanWrapper(user).saveStaffPlan(param));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).saveStaffPlan(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -87,7 +87,7 @@ public class StaffPlanController {
     public ReturnResult updateStaffPlan(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffPlanWrapper(user).updateStaffPlan(param));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).updateStaffPlan(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -107,7 +107,7 @@ public class StaffPlanController {
     public ReturnResult updateForbiddenTagById(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody StaffPlanSearchParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffPlanWrapper(user).updateForbiddenTagById(param));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -128,7 +128,7 @@ public class StaffPlanController {
     public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffPlanWrapper(user).deleteByIds(param.getIds()));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -148,7 +148,7 @@ public class StaffPlanController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getStaffPlanWrapper(user).getSearchCondition(map));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -169,7 +169,7 @@ public class StaffPlanController {
         try {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getStaffPlanWrapper(user).getForm(map));
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).getForm(map));
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }
@@ -188,7 +188,7 @@ public class StaffPlanController {
     public ReturnResult getHasRight(@Context HttpServletRequest request, @Context HttpServletResponse response) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            return ReturnResult.successed(getStaffPlanWrapper(user).getHasRight());
+            return ReturnResult.successed(user,getStaffPlanWrapper(user).getHasRight());
         } catch (Exception e) {
            return ReturnResult.exceptionHandle(e);
         }

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

@@ -36,7 +36,7 @@ public class VersionManageController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
             getVersionManageWrapper(user).save(moduleTypeEnum,params);
-            return ReturnResult.successed();
+            return ReturnResult.successed(user);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }
@@ -51,7 +51,7 @@ public class VersionManageController {
             User user = HrmUserVarify.getUser(request, response);
             Map<String, Object> params = ParamUtil.request2Map(request);
             Map<String,Object> map = getVersionManageWrapper(user).getVersion(moduleTypeEnum,params);
-            return ReturnResult.successed(map);
+            return ReturnResult.successed(user,map);
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

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

@@ -25,6 +25,6 @@ public class CodeSettingWrapper extends Service {
     }
 
     public ReturnResult saveOrUpdateCodeSetting(CodeSaveParam params) {
-        return ReturnResult.successed(getCodeSettingService(user).saveOrUpdateCodeSetting(params));
+        return ReturnResult.successed(user,getCodeSettingService(user).saveOrUpdateCodeSetting(params));
     }
 }

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

@@ -59,7 +59,7 @@ public class DepartmentWrapper extends OrganizationWrapper {
 
     public ReturnResult getDeptListByPid(QuerySingleDeptListParam param) {
         PageInfo<SingleDeptTreeVO> singleDeptTreeVOS = getDepartmentService(user).getDeptListByPid(param);
-        return ReturnResult.successed(singleDeptTreeVOS);
+        return ReturnResult.successed(user,singleDeptTreeVOS);
     }
 
     /**

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

@@ -31,7 +31,7 @@ public class FieldDefinedWrapper extends Service {
 
     public ReturnResult getTree(ModuleTypeEnum moduleTypeEnum) {
         List<TypeTreeVO> treeDTOS = getFieldDefinedService(user).getTree(moduleTypeEnum);
-        return ReturnResult.successed(treeDTOS);
+        return ReturnResult.successed(user,treeDTOS);
     }
 
     /**
@@ -67,7 +67,7 @@ public class FieldDefinedWrapper extends Service {
 
     public ReturnResult changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
         getFieldDefinedService(user).changeTree(moduleTypeEnum, fieldTypeTreeParam);
-        return ReturnResult.successed();
+        return ReturnResult.successed(user);
     }
 
 
@@ -78,12 +78,12 @@ public class FieldDefinedWrapper extends Service {
 
     public ReturnResult deleteTree(Long id) {
         getFieldDefinedService(user).deleteTree(id);
-        return ReturnResult.successed();
+        return ReturnResult.successed(user);
     }
 
     public ReturnResult saveTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
         getFieldDefinedService(user).saveTree(moduleTypeEnum, fieldTypeTreeParam);
-        return ReturnResult.successed();
+        return ReturnResult.successed(user);
     }
 
     public int saveFields(String data) {

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

@@ -203,7 +203,7 @@ public class JobWrapper extends OrganizationWrapper {
         deptBrowserItem.setRules("required|string");
         condition.add(deptBrowserItem);
         addGroups.add(new SearchConditionGroup("", true, condition));
-        return ReturnResult.successed(addGroups);
+        return ReturnResult.successed(user,addGroups);
     }
 
     /**
@@ -214,7 +214,7 @@ public class JobWrapper extends OrganizationWrapper {
      */
     public ReturnResult getHrmListByJobId(Long jobId) {
         Map<String, Object> hrmListByJobId = getJobService(user).getHrmListByJobId(jobId);
-        return ReturnResult.successed(hrmListByJobId);
+        return ReturnResult.successed(user,hrmListByJobId);
     }
 
     public List<SearchConditionGroup> getMergeForm(Long id) {