diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java
index 7e8f4eef..3d616195 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/HRInfo.java
@@ -1,15 +1,11 @@
package com.op.system.api.domain.quality;
import com.op.common.core.web.domain.BaseEntity;
-import com.op.common.core.xss.Xss;
import com.op.system.api.domain.SysDept;
import com.op.system.api.domain.SysRole;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
import java.util.Date;
import java.util.List;
@@ -72,6 +68,25 @@ public class HRInfo extends BaseEntity {
private String poscd;//岗位编码
private String ounam;//部门名称
private String oucod;//部门编码
+ private String wxId;
+ private String section;
+ private String peSnr;
+
+ public String getSection() {
+ return section;
+ }
+
+ public void setSection(String section) {
+ this.section = section;
+ }
+
+ public String getPeSnr() {
+ return peSnr;
+ }
+
+ public void setPeSnr(String peSnr) {
+ this.peSnr = peSnr;
+ }
public String getPeWorkID() {
return peWorkID;
diff --git a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java
index a94ac60f..f58dfdbc 100644
--- a/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java
+++ b/op-common/op-common-core/src/main/java/com/op/common/core/utils/poi/ExcelMapUtil.java
@@ -43,9 +43,11 @@ public class ExcelMapUtil {
Cell titleCell = sheetTitleRow.createCell(i*rangeVal+1);//创建第一行第一个单元格
titleCell.setCellValue(title1s[i]);//传值
titleCell.setCellStyle(getHeaderFont(sheet.getWorkbook()));//设置样式
- //主标题行合并单元格
- CellRangeAddress cellAddresses = new CellRangeAddress(0, 0, i*rangeVal+1, (i+1)*rangeVal);
- sheet.addMergedRegion(cellAddresses);
+ if((i*rangeVal+1)!=(i+1)*rangeVal){
+ //主标题行合并单元格
+ CellRangeAddress cellAddresses = new CellRangeAddress(0, 0, i*rangeVal+1, (i+1)*rangeVal);
+ sheet.addMergedRegion(cellAddresses);
+ }
}
//创建表头行(第二行)
diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
index 22d19da5..773f5703 100644
--- a/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/op-modules/op-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -189,12 +189,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into sys_user
(user_name,nick_name,post,dept_id,
phonenumber,sex,status,
- create_by,create_time,del_flag)
+ create_by,create_time,del_flag,
+ section,pe_snr)
VALUES
(#{item.userName},#{item.nickName},#{item.post},#{item.deptId},
#{item.phonenumber},#{item.sex},#{item.status},
- #{item.createBy},#{item.createTime},'0')
+ #{item.createBy},#{item.createTime},'0',#{item.section},#{item.peSnr})
@@ -238,6 +239,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
section = #{item.deptId},
post = #{item.post},
phonenumber = #{item.phonenumber},
+ section = #{item.section},
+ pe_snr = #{item.peSnr},
sex = #{item.sex},
del_flag = #{item.delFlag},
update_by = #{item.updateBy},