Pre Merge pull request !137 from dxfeng/feature/dxf

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

@@ -44,6 +44,8 @@ public class CompBO {
         Map<Long, List<CompListDTO>> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany));
         // 处理被引用数据
         List<String> usedIds = MapperProxyFactory.getProxy(CompMapper.class).listUsedId();
+        // 兼容MySQL
+        usedIds.addAll(MapperProxyFactory.getProxy(CompMapper.class).listUsedIds());
         List<String> collect = Arrays.stream(String.join(",", usedIds).split(",")).collect(Collectors.toList());
         return dtoList.stream().peek(e -> {
             List<CompListDTO> childList = collects.get(e.getId());

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

@@ -0,0 +1,85 @@
+package com.engine.organization.entity.hrmresource.vo;
+
+import com.cloudstore.eccom.pc.table.WeaTableType;
+import com.engine.organization.annotation.OrganizationTable;
+import com.engine.organization.annotation.OrganizationTableColumn;
+import com.engine.organization.annotation.OrganizationTableOperate;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2022/07/01
+ * @version: 1.0
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@OrganizationTable(pageId = "2f2011f7-f915-11ec-8d51-00e04c680716",
+        fields = "t.id," +
+                "t.lastname," +
+                "t.departmentid," +
+                "t.subcompanyid1," +
+                "t.mobile," +
+                "t.telephone," +
+                "t.managerid, " +
+                "t.dsporder ",
+        fromSql = "FROM hrmresource t ",
+        orderby = " dsporder ",
+        sortway = " asc",
+        primarykey = "id",
+        operates = {
+                @OrganizationTableOperate(index = "0", text = "发消息"),
+                @OrganizationTableOperate(index = "1", text = "发送邮件"),
+                @OrganizationTableOperate(index = "1", text = "发送短信"),
+                @OrganizationTableOperate(index = "1", text = "新建日程"),
+                @OrganizationTableOperate(index = "1", text = "系统信息"),
+        },
+        tableType = WeaTableType.CHECKBOX
+)
+public class ScHrmResourceVO {
+    /**
+     * 主键
+     */
+    @OrganizationTableColumn(column = "id", display = false)
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    @OrganizationTableColumn(text = "姓名", width = "25%", column = "lastname")
+    private String lastName;
+    /**
+     * 部门
+     */
+    @OrganizationTableColumn(text = "部门", width = "25%", column = "departmentid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getScDepartmentName")
+    private String departmentName;
+
+    /**
+     * 分部
+     */
+    @OrganizationTableColumn(text = "分部", width = "25%", column = "subcompanyid1", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getScCompanyName")
+    private String companyName;
+
+    /**
+     * 移动电话
+     */
+    @OrganizationTableColumn(text = "移动电话", width = "25%", column = "mobile")
+    private String mobile;
+    /**
+     * 办公室电话
+     */
+    @OrganizationTableColumn(text = "办公室电话", width = "25%", column = "telephone")
+    private String telephone;
+    /**
+     * 直接上级
+     */
+    @OrganizationTableColumn(text = "直接上级", width = "25%", column = "managerid", transmethod = "com.engine.organization.transmethod.HrmResourceTransMethod.getScManagerName")
+    private String managerName;
+
+    @OrganizationTableColumn(text = "显示顺序", width = "25%", column = "dsporder", orderkey = "dsporder")
+    private Integer showOrder;
+}

src/com/engine/organization/mapper/comp/CompMapper.java

@@ -28,6 +28,8 @@ public interface CompMapper {
      */
     List<String> listUsedId();
 
+    List<String> listUsedIds();
+
     /**
      * 根据搜索条件查询数据
      *

src/com/engine/organization/mapper/comp/CompMapper.xml

@@ -266,10 +266,6 @@
         from JCL_ORG_JOB
         where delete_type = 0
         union
-        select company_id
-        from JCL_ORG_STAFFPLAN
-        where delete_type = 0
-        union
         select comp_id
         from JCL_ORG_STAFF
         where delete_type = 0
@@ -288,6 +284,11 @@
         select COUNT(id) from jcl_org_comp where 1=1
         <include refid="nullParentCompany"/>
     </select>
+    <select id="listUsedIds" resultType="java.lang.String">
+        select company_id
+        from JCL_ORG_STAFFPLAN
+        where delete_type = 0
+    </select>
 
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.sequence.po.SequencePO">
         update jcl_org_comp

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

@@ -2,6 +2,7 @@ package com.engine.organization.mapper.hrmresource;
 
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +24,10 @@ public interface SystemDataMapper {
     List<JSONObject> getHrmLocationsByCountryId();
 
     List<JSONObject> getHrmUseKindData();
+
+    String getScCompanyNameById(@Param("companyId") String companyId);
+
+    String getScDepartmentNameById(@Param("departmentId") String departmentId);
+
+    String getScHrmResourceNameById(@Param("managerId") String managerId);
 }

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

@@ -33,4 +33,19 @@
         select id, name
         from HrmUseKind
     </select>
+    <select id="getScCompanyNameById" resultType="java.lang.String">
+        select subcompanyname
+        from hrmsubcompany
+        where id = #{companyId}
+    </select>
+    <select id="getScDepartmentNameById" resultType="java.lang.String">
+        select departmentname
+        from hrmdepartment
+        where id = #{departmentId}
+    </select>
+    <select id="getScHrmResourceNameById" resultType="java.lang.String">
+        select lastname
+        from hrmresource
+        where id = #{managerId}
+    </select>
 </mapper>

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

@@ -13,7 +13,7 @@ import com.engine.organization.entity.department.bo.DepartmentBO;
 import com.engine.organization.entity.department.po.DepartmentPO;
 import com.engine.organization.entity.extend.po.ExtendTitlePO;
 import com.engine.organization.entity.hrmresource.param.HrmResourceSearchParam;
-import com.engine.organization.entity.hrmresource.vo.HrmResourceVO;
+import com.engine.organization.entity.hrmresource.vo.ScHrmResourceVO;
 import com.engine.organization.entity.job.bo.JobBO;
 import com.engine.organization.entity.job.po.JobPO;
 import com.engine.organization.entity.searchtree.SearchTree;
@@ -114,9 +114,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     @Override
     public Map<String, Object> listPage(HrmResourceSearchParam params) {
         Map<String, Object> resultMap = new HashMap<>();
-        OrganizationWeaTable<HrmResourceVO> table = new OrganizationWeaTable<>(user, HrmResourceVO.class);
-        String sqlWhere = buildSqlWhere(params);
-        table.setSqlwhere(sqlWhere);
+        OrganizationWeaTable<ScHrmResourceVO> table = new OrganizationWeaTable<>(user, ScHrmResourceVO.class);
+        //String sqlWhere = buildSqlWhere(params);
+        //table.setSqlwhere(sqlWhere);
         WeaResultMsg result = new WeaResultMsg(false);
         result.putAll(table.makeDataResult());
         result.success();

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

@@ -3,6 +3,7 @@ package com.engine.organization.transmethod;
 import com.engine.organization.mapper.comp.CompMapper;
 import com.engine.organization.mapper.department.DepartmentMapper;
 import com.engine.organization.mapper.hrmresource.HrmResourceMapper;
+import com.engine.organization.mapper.hrmresource.SystemDataMapper;
 import com.engine.organization.util.db.MapperProxyFactory;
 
 /**
@@ -23,4 +24,19 @@ public class HrmResourceTransMethod {
     public static String getManagerName(String managerId) {
         return MapperProxyFactory.getProxy(HrmResourceMapper.class).getLastNameById(Long.parseLong(managerId));
     }
+
+    public static String getScDepartmentName(String departmentId) {
+        return MapperProxyFactory.getProxy(SystemDataMapper.class).getScDepartmentNameById(departmentId);
+    }
+
+    public static String getScCompanyName(String subCompanyId) {
+        return MapperProxyFactory.getProxy(SystemDataMapper.class).getScDepartmentNameById(subCompanyId);
+    }
+
+    public static String getScManagerName(String managerId) {
+        if ("0".equals(managerId)) {
+            return "";
+        }
+        return MapperProxyFactory.getProxy(SystemDataMapper.class).getScHrmResourceNameById(managerId);
+    }
 }

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

@@ -6,9 +6,12 @@ package com.engine.organization.util.response;
  * @Date 2022/4/26
  * @Version V1.0
  **/
+
+import weaver.general.BaseBean;
+
 import java.io.Serializable;
 
-public class ReturnResult <T> implements Serializable {
+public class ReturnResult<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private long code;
@@ -16,8 +19,8 @@ public class ReturnResult <T> implements Serializable {
     private String msg;
 
     public ReturnResult() {
-        this.code= ResultCode.SUCCESS.getCode();
-        this.msg=  ResultCode.SUCCESS.getMessage();
+        this.code = ResultCode.SUCCESS.getCode();
+        this.msg = ResultCode.SUCCESS.getMessage();
     }
 
     /**
@@ -34,6 +37,7 @@ public class ReturnResult <T> implements Serializable {
 
     /**
      * 返回 code 和 data
+     *
      * @param data
      */
     public ReturnResult(T data) {
@@ -43,6 +47,7 @@ public class ReturnResult <T> implements Serializable {
 
     /**
      * 返回 code 和 msg
+     *
      * @param code
      * @param msg
      */
@@ -76,19 +81,19 @@ public class ReturnResult <T> implements Serializable {
     }
 
 
-    public ReturnResult Msg(String msg){
+    public ReturnResult Msg(String msg) {
         this.setMsg(msg);
         return this;
     }
 
 
-    public ReturnResult Code(long code){
+    public ReturnResult Code(long code) {
         this.setCode(code);
         return this;
     }
 
 
-    public ReturnResult Data(T data){
+    public ReturnResult Data(T data) {
         this.setData(data);
         return this;
     }
@@ -156,12 +161,14 @@ public class ReturnResult <T> implements Serializable {
 
     /**
      * 异常处理
-     * @param msg
+     *
+     * @param e
      * @param <T>
      * @return
      */
-    public static <T> ReturnResult<T> exceptionHandle(String msg) {
-        return new ReturnResult<>(ResultCode.FAILED.getCode(), msg);
+    public static <T> ReturnResult<T> exceptionHandle(Exception e) {
+        new BaseBean().writeLog(e);
+        return new ReturnResult<>(ResultCode.FAILED.getCode(), e.getMessage());
     }
 
     /**

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

@@ -42,7 +42,7 @@ public class CodeSettingController {
             User user = HrmUserVarify.getUser(request, response);
             return getCodeSettingWrapper(user).getHasRight(serialtype);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -55,7 +55,7 @@ public class CodeSettingController {
             User user = HrmUserVarify.getUser(request, response);
             return getCodeSettingWrapper(user).saveOrUpdateCodeSetting(params);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -48,7 +48,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).listPage(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -68,7 +68,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).saveBaseComp(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+            return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -88,7 +88,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -108,7 +108,7 @@ public class CompController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getCompWrapper(user).updateComp(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -129,7 +129,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -149,7 +149,7 @@ public class CompController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getCompWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +168,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -188,7 +188,7 @@ public class CompController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getCompWrapper(user).getCompBaseForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -208,7 +208,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).getCompSaveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -220,7 +220,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).getMoveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -232,7 +232,7 @@ public class CompController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getCompWrapper(user).moveCompany(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -38,7 +38,7 @@ public class DemoController {
             User user = HrmUserVarify.getUser(request, response);
             return getDemoWrapper(user).testDemo(name);
         }catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -58,7 +58,7 @@ public class DemoController {
             Demo list = testService.list(name);
             return ReturnResult.successed(list);
         }catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -44,7 +44,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return getDepartmentWrapper(user).getDeptListByPid(querySingleDeptListParam);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -58,7 +58,7 @@ public class DepartmentController {
             String parentDept = (String) map.get("parentDept");
             return ReturnResult.successed(getDepartmentWrapper(user).getJobListByPid(QuerySingleDeptListParam.builder().parentDept(Long.parseLong(parentDept)).build()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -96,7 +96,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).listPage(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -116,7 +116,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -136,7 +136,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -156,7 +156,7 @@ public class DepartmentController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getDepartmentWrapper(user).updateForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -177,7 +177,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -197,7 +197,7 @@ public class DepartmentController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getDepartmentWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -216,7 +216,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -236,7 +236,7 @@ public class DepartmentController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getDepartmentWrapper(user).getDeptBaseForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -255,7 +255,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).getSaveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -268,7 +268,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).getCopyForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -280,7 +280,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).copyDepartment(copyParam));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -294,7 +294,7 @@ public class DepartmentController {
             String id = (String) map.get("id");
             return ReturnResult.successed(getDepartmentWrapper(user).getMergeForm(Long.parseLong(id)));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -306,7 +306,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).mergeDepartment(mergeParam));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -318,7 +318,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).getMoveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -330,7 +330,7 @@ public class DepartmentController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getDepartmentWrapper(user).moveDepartment(moveParam));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -41,7 +41,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return getFieldDefinedWrapper(user).getTree(moduleTypeEnum);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -54,7 +54,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return getFieldDefinedWrapper(user).saveTree(moduleTypeEnum, fieldTypeTreeParam);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -67,7 +67,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return getFieldDefinedWrapper(user).changeTree(moduleTypeEnum, fieldTypeTreeParam);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -80,7 +80,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return getFieldDefinedWrapper(user).deleteTree(fieldTypeTreeParam.getId());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -95,7 +95,7 @@ public class FieldDefinedController {
             String groupType = (String) map.get("groupType");
             return ReturnResult.successed(getFieldDefinedWrapper(user).getTabInfo(groupType));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -115,7 +115,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getFieldDefinedWrapper(user).saveGroup(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -135,7 +135,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getFieldDefinedWrapper(user).saveTitle(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -159,7 +159,7 @@ public class FieldDefinedController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getFieldDefinedWrapper(user).saveFields(param.getData()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -174,7 +174,7 @@ public class FieldDefinedController {
             Long groupId = Long.parseLong((String) map.get("groupId"));
             return ReturnResult.successed(getFieldDefinedWrapper(user).getFieldDefinedInfo(ExtendFieldSearchParam.builder().groupType(groupType).groupId(groupId).build()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -187,7 +187,7 @@ public class FieldDefinedController {
             getFieldDefinedWrapper(user).deleteFieldDefined(param);
             return ReturnResult.successed();
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -200,7 +200,7 @@ public class FieldDefinedController {
             getFieldDefinedWrapper(user).changeGroup(param);
             return ReturnResult.successed();
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -47,7 +47,7 @@ public class GradeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getGradeWrapper(user).listPage(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -66,7 +66,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).saveGrade(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).updateGrade(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -106,7 +106,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -127,7 +127,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class GradeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getGradeWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +168,7 @@ public class GradeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getGradeWrapper(user).getGradeForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -187,7 +187,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -199,7 +199,7 @@ public class GradeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGradeWrapper(user).getTabInfo());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -45,7 +45,7 @@ public class GroupController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getGroupWrapper(user).getGroupFormField(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -57,7 +57,7 @@ public class GroupController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGroupWrapper(user).updateGroup(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -76,7 +76,7 @@ public class GroupController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGroupWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -88,7 +88,7 @@ public class GroupController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getGroupWrapper(user).getTabInfo());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -67,7 +67,7 @@ public class HrmResourceController {
             HrmResourceSearchParam param = JSONObject.toJavaObject((JSON) JSONObject.toJSON(map), HrmResourceSearchParam.class);
             return ReturnResult.successed(getHrmResourceWrapper(user).listPage(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class HrmResourceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getHrmResourceWrapper(user).getSaveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -105,7 +105,7 @@ public class HrmResourceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getHrmResourceWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -125,7 +125,7 @@ public class HrmResourceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getHrmResourceWrapper(user).getBaseForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -145,7 +145,7 @@ public class HrmResourceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getHrmResourceWrapper(user).updateForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -165,7 +165,7 @@ public class HrmResourceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getHrmResourceWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -184,7 +184,7 @@ public class HrmResourceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getHrmResourceWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -36,7 +36,7 @@ public class ImportCommonController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getImportCommonWrapper(user).saveImportResource(map, request));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -67,7 +67,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).listPage(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).getSaveForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -106,7 +106,7 @@ public class JobController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getJobWrapper(user).getJobBaseForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -126,7 +126,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).saveBaseForm(params));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -146,7 +146,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -166,7 +166,7 @@ public class JobController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getJobWrapper(user).updateForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -186,7 +186,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).copyJobItem(param.getIds(), param.getDepartment()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -206,7 +206,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -225,7 +225,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -244,7 +244,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).getSearchCondition());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -257,7 +257,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return getJobWrapper(user).getCopyForm();
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -271,7 +271,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return getJobWrapper(user).getHrmListByJobId(jobId);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -283,7 +283,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).getMergeForm());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -295,7 +295,7 @@ public class JobController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getJobWrapper(user).mergeJob(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -47,7 +47,7 @@ public class LevelController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getLevelWrapper(user).listPage(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -66,7 +66,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).saveLevel(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).updateLevel(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -106,7 +106,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -127,7 +127,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class LevelController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getLevelWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +168,7 @@ public class LevelController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getLevelWrapper(user).getLevelForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -187,7 +187,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).getTableBtn());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -199,7 +199,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).getTabInfo());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -211,7 +211,7 @@ public class LevelController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getLevelWrapper(user).getTreeData());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -48,7 +48,7 @@ public class PostController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostWrapper(user).savePost(postPO));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -68,7 +68,7 @@ public class PostController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostWrapper(user).updatePost(postPO));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -89,7 +89,7 @@ public class PostController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -110,7 +110,7 @@ public class PostController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getPostWrapper(user).getPostForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -128,7 +128,7 @@ public class PostController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostWrapper(user).getTreeData());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -47,7 +47,7 @@ public class PostInfoController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getPostInfoWrapper(user).listPage(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -66,7 +66,7 @@ public class PostInfoController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostInfoWrapper(user).savePostInfo(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class PostInfoController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostInfoWrapper(user).updatePostInfo(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -106,7 +106,7 @@ public class PostInfoController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostInfoWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -127,7 +127,7 @@ public class PostInfoController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostInfoWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class PostInfoController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getPostInfoWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +168,7 @@ public class PostInfoController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getPostInfoWrapper(user).getPostInfoForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -187,7 +187,7 @@ public class PostInfoController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getPostInfoWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -49,7 +49,7 @@ public class SchemeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSchemeWrapper(user).listPage(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -69,7 +69,7 @@ public class SchemeController {
             Map<String, Object> save = getSchemeWrapper(user).save(param);
             return ReturnResult.successed(save);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -90,7 +90,7 @@ public class SchemeController {
             Map<String, Object> update = getSchemeWrapper(user).updateScheme(param);
             return ReturnResult.successed(update);
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -112,7 +112,7 @@ public class SchemeController {
             getSchemeWrapper(user).updateForbiddenTagById(param);
             return ReturnResult.successed();
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -134,7 +134,7 @@ public class SchemeController {
             getSchemeWrapper(user).deleteByIds(param.getIds());
             return ReturnResult.successed();
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class SchemeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSchemeWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -161,7 +161,7 @@ public class SchemeController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSchemeWrapper(user).getSchemeForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -173,7 +173,7 @@ public class SchemeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSchemeWrapper(user).getTableBtn());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -185,7 +185,7 @@ public class SchemeController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSchemeWrapper(user).getTreeData());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 

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

@@ -47,7 +47,7 @@ public class SequenceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSequenceWrapper(user).listPage(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -66,7 +66,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).saveSequence(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -86,7 +86,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).updateSequence(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -106,7 +106,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -127,7 +127,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -147,7 +147,7 @@ public class SequenceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSequenceWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -168,7 +168,7 @@ public class SequenceController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getSequenceWrapper(user).getSequenceForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -187,7 +187,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -199,7 +199,7 @@ public class SequenceController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getSequenceWrapper(user).getTabInfo());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -50,7 +50,7 @@ public class StaffController {
             StaffSearchParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffSearchParam.class);
             return ReturnResult.successed(getStaffWrapper(user).listPage(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -69,7 +69,7 @@ public class StaffController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffWrapper(user).saveStaff(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -89,7 +89,7 @@ public class StaffController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffWrapper(user).updateStaff(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -110,7 +110,7 @@ public class StaffController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -130,7 +130,7 @@ public class StaffController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getStaffWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -151,7 +151,7 @@ public class StaffController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getStaffWrapper(user).getForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -170,7 +170,7 @@ public class StaffController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }

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

@@ -50,7 +50,7 @@ public class StaffPlanController {
             StaffPlanSearchParam param = JSONObject.toJavaObject((JSON) JSON.toJSON(map), StaffPlanSearchParam.class);
             return ReturnResult.successed(getStaffPlanWrapper(user).listPage(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -69,7 +69,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffPlanWrapper(user).saveStaffPlan(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -89,7 +89,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffPlanWrapper(user).updateStaffPlan(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -109,7 +109,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffPlanWrapper(user).updateForbiddenTagById(param));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -130,7 +130,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffPlanWrapper(user).deleteByIds(param.getIds()));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -150,7 +150,7 @@ public class StaffPlanController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getStaffPlanWrapper(user).getSearchCondition(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -171,7 +171,7 @@ public class StaffPlanController {
             Map<String, Object> map = ParamUtil.request2Map(request);
             return ReturnResult.successed(getStaffPlanWrapper(user).getForm(map));
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 
@@ -190,7 +190,7 @@ public class StaffPlanController {
             User user = HrmUserVarify.getUser(request, response);
             return ReturnResult.successed(getStaffPlanWrapper(user).getHasRight());
         } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e.getMessage());
+           return ReturnResult.exceptionHandle(e);
         }
     }
 }