人员导入

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

@@ -545,8 +545,8 @@ public class PersonInfoController {
                     }
 
                     Map<String, Object> searchParams = new HashMap<>();
-//                    searchParams.put("companyId", companyId);
-//                    searchParams.put("idCard", idCard);
+                    searchParams.put("companyId", companyId);
+                    searchParams.put("idCard", idCard);
                     List<Sort> sortList = new ArrayList<>();
                     sortList.add(new Sort("id_","asc"));
                     Page<PersonInfo> page = personInfoService.pageSearch(searchParams, 1, 1,false, sortList);
@@ -583,10 +583,10 @@ public class PersonInfoController {
                         personInfo.setPosition3(position3);
                         personInfo.setPosition4(position4);
                         personInfo.setPosition5(position5);
-                        personInfo.setFaceEnabled(Boolean.valueOf(enabledFace));
-                        personInfo.setCardEnabled(Boolean.valueOf(enabledCard));
-                        personInfo.setAppEnabled(Boolean.valueOf(enabledApp));
-                        personInfo.setGuestEnabled(Boolean.valueOf(enabledGuest));
+                        if(enabledFace.contains("开")) personInfo.setFaceEnabled(true); else personInfo.setFaceEnabled(false);
+                        if(enabledCard.contains("开")) personInfo.setCardEnabled(true); else personInfo.setCardEnabled(false);
+                        if(enabledApp.contains("开")) personInfo.setAppEnabled(true); else personInfo.setAppEnabled(false);
+                        if(enabledGuest.contains("开")) personInfo.setGuestEnabled(true); else personInfo.setGuestEnabled(false);
                         personInfo.setDelFlag(false);
                         personInfo.setCreateBy(subject);
                         personInfo.setCreateTime(new Date());
@@ -651,7 +651,7 @@ public class PersonInfoController {
         return msgResult;
     }
 
-    @ApiOperation(value="导入人员（非企业账户需要输入企业ID）")
+    @ApiOperation(value="导出人员")
     @PostMapping("exportXls")
     public MessageResult<String> exportXls(@RequestAttribute String subject){
         User user = userService.get(subject);