bug修改

src/main/java/org/rcisoft/sys/sysuser/service/impl/SysUserServiceImpl.java

@@ -296,6 +296,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                 String dictLabel = sysDictData1.get(0).getDictLabel();
                 sysUserIPage.getRecords().get(i).setDictLabelBynltBz(dictLabel);
             }
+            //查询园区id
+            String address = sysUserIPage.getRecords().get(i).getAddress();
+
         }
         return sysUserIPage;
     }
@@ -572,9 +575,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                 //性别
                 if (sysUser.getSex() != null) {
                     if (sysUser.getSex().equals("男")) {
-                        sysUser.setSex("0");
-                    } else if (sysUser.getSex().equals("女")) {
                         sysUser.setSex("1");
+                    } else if (sysUser.getSex().equals("女")) {
+                        sysUser.setSex("0");
                     } else {
                         throw new CyServiceException(500, "用户性别数据错误");
                     }
@@ -582,6 +585,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                     throw new CyServiceException(500, "用户性别不能为空");
                 }
 
+
                 //所属部门
                 SysDept sysDept = sysDeptRepositorys.querySysDeptByName(sysUser.getDeptId());
                 if (sysDept == null || sysDept.equals(' ')) {
@@ -594,29 +598,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
                 if (sysDictData1 == null || sysDictData1.equals(' ')) {
                     throw new CyServiceException(500, "职位信息数据错误");
                 } else {
-                    sysUser.setPosition(sysDictData1.getBusinessId().toString());
+                    sysUser.setPosition(sysDictData1.getDictValue());
                 }
                 //字典班次
                 SysDictData sysDictData2 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getNltBz());
                 if (sysDictData2 == null || sysDictData2.equals(' ')) {
                     throw new CyServiceException(500, "班次信息数据错误");
                 } else {
-                    sysUser.setNltBz(sysDictData2.getBusinessId().toString());
+                    sysUser.setNltBz(sysDictData2.getDictValue());
                 }
-                //工作状态
-                if (sysUser.getFlag() != null) {
-                    if (sysUser.getFlag().equals("停用")) {
-                        sysUser.setFlag("0");
-                    } else if (sysUser.getFlag().equals("正常") || sysUser.getFlag().equals("在职")) {
-                        sysUser.setFlag("1");
-                    } else if (sysUser.getFlag().equals("离职")) {
-                        sysUser.setFlag("2");
-                    } else {
-                        throw new CyServiceException(500, "工作状态数据错误");
-                    }
+                //字典园区
+                SysDictData sysDictData3 = sysDictDataRepositorys.queryDataByDeptIdC(sysUser.getAddress());
+                if (sysDictData3 == null || sysDictData3.equals(' ')) {
+                    throw new CyServiceException(500, "园区信息数据错误");
                 } else {
-                    throw new CyServiceException(500, "工作状态不能为空");
+                    sysUser.setAddress(sysDictData3.getDictValue());
                 }
+                //工作状态
+                sysUser.setFlag("1");
 
                 //用户类型
                 sysUser.setUserType("0");

src/main/java/org/rcisoft/sys/visit/controller/VisitPersonController.java

@@ -171,6 +171,8 @@ public class VisitPersonController extends CyPaginationController<SysUser> {
             visitPerson.setName(u.getName());
             visitPerson.setPhone(u.getPhone());
             visitPerson.setBlacklistFlag(u.getBlacklistFlag());
+            visitPerson.setFirstDate(u.getFirstDate());
+            visitPerson.setLastDate(u.getLastDate());
             visitPersonList.add(visitPerson);
         }
         CyEpExcelUtil.exportExcel(visitPersonList, "访客表信息", "访客表信息", VisitPerson.class, excelName, response);