Merge remote-tracking branch 'origin/V1' into V1

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

@@ -753,33 +753,33 @@ public class PersonInfoController {
             for(int i=0; i<page.size(); i++){
                 PersonInfo personInfo = page.get(i);
 
-                HSSFRow rowContent = sheet.createRow(0);
+                HSSFRow rowContent = sheet.createRow(i + 1);
                 HSSFCell cellContent1 = rowContent.createCell(0);
                 cellContent1.setCellValue(i+1);
                 HSSFCell cellContent2 = rowContent.createCell(1);
-                cellContent2.setCellValue(personInfo.getName());
+                if(personInfo.getName() != null) cellContent2.setCellValue(personInfo.getName());
                 HSSFCell cellContent3 = rowContent.createCell(2);
-                cellContent3.setCellValue(personInfo.getIdCard());
+                if(personInfo.getIdCard() != null) cellContent3.setCellValue(personInfo.getIdCard());
                 HSSFCell cellContent4 = rowContent.createCell(3);
-                cellContent4.setCellValue(personInfo.getPhone());
+                if(personInfo.getPhone() != null) cellContent4.setCellValue(personInfo.getPhone());
                 HSSFCell cellContent5 = rowContent.createCell(4);
-                cellContent5.setCellValue(personInfo.getPosition1());
+                if(personInfo.getPosition1() != null) cellContent5.setCellValue(personInfo.getPosition1());
                 HSSFCell cellContent6 = rowContent.createCell(5);
-                cellContent6.setCellValue(personInfo.getPosition2());
+                if(personInfo.getPosition2() != null) cellContent6.setCellValue(personInfo.getPosition2());
                 HSSFCell cellContent7 = rowContent.createCell(6);
-                cellContent7.setCellValue(personInfo.getPosition3());
+                if(personInfo.getPosition3() != null) cellContent7.setCellValue(personInfo.getPosition3());
                 HSSFCell cellContent8 = rowContent.createCell(7);
-                cellContent8.setCellValue(personInfo.getPosition4());
+                if(personInfo.getPosition4() != null) cellContent8.setCellValue(personInfo.getPosition4());
                 HSSFCell cellContent9 = rowContent.createCell(8);
-                cellContent9.setCellValue(personInfo.getPosition5());
+                if(personInfo.getPosition5() != null) cellContent9.setCellValue(personInfo.getPosition5());
                 HSSFCell cellContent10 = rowContent.createCell(9);
-                cellContent10.setCellValue(personInfo.getFaceEnabled());
+                if(personInfo.getFaceEnabled() != null && personInfo.getFaceEnabled() == true) cellContent10.setCellValue("开"); else cellContent10.setCellValue("关");
                 HSSFCell cellContent11 = rowContent.createCell(10);
-                cellContent11.setCellValue(personInfo.getCardEnabled());
+                if(personInfo.getCardEnabled() != null && personInfo.getCardEnabled() == true) cellContent11.setCellValue("开"); else cellContent11.setCellValue("关");
                 HSSFCell cellContent12 = rowContent.createCell(11);
-                cellContent12.setCellValue(personInfo.getAppEnabled());
+                if(personInfo.getAppEnabled() != null && personInfo.getAppEnabled() == true) cellContent12.setCellValue("开"); else cellContent12.setCellValue("关");
                 HSSFCell cellContent13 = rowContent.createCell(12);
-                cellContent13.setCellValue(personInfo.getGuestEnabled());
+                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: