人员导出修改

web/src/main/java/com/jpsoft/smart/modules/base/controller/PersonInfoController.java

@@ -773,13 +773,13 @@ public class PersonInfoController {
                 HSSFCell cellContent9 = rowContent.createCell(8);
                 if(personInfo.getPosition5() != null) cellContent9.setCellValue(personInfo.getPosition5());
                 HSSFCell cellContent10 = rowContent.createCell(9);
-                if(personInfo.getFaceEnabled() == true) cellContent10.setCellValue("开"); else cellContent10.setCellValue("关");
+                if(personInfo.getFaceEnabled() != null && personInfo.getFaceEnabled() == true) cellContent10.setCellValue("开"); else cellContent10.setCellValue("关");
                 HSSFCell cellContent11 = rowContent.createCell(10);
-                if(personInfo.getCardEnabled() == true) cellContent11.setCellValue("开"); else cellContent11.setCellValue("关");
+                if(personInfo.getCardEnabled() != null && personInfo.getCardEnabled() == true) cellContent11.setCellValue("开"); else cellContent11.setCellValue("关");
                 HSSFCell cellContent12 = rowContent.createCell(11);
-                if(personInfo.getAppEnabled() == true) cellContent12.setCellValue("开"); else cellContent12.setCellValue("关");
+                if(personInfo.getAppEnabled() != null && personInfo.getAppEnabled() == true) cellContent12.setCellValue("开"); else cellContent12.setCellValue("关");
                 HSSFCell cellContent13 = rowContent.createCell(12);
-                if(personInfo.getGuestEnabled() == true) cellContent13.setCellValue("开"); else cellContent13.setCellValue("关");
+                if(personInfo.getGuestEnabled() != null && personInfo.getGuestEnabled() == true) cellContent13.setCellValue("开"); else cellContent13.setCellValue("关");
             }
 
             //todo 将wb保存到oss

web/src/main/resources/application-dev.yml

@@ -5,9 +5,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: root
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/smart-community?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: smart
+    password: smart
   devtools:
     add-properties: false
     restart: