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

jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/OutSidePersonController.java

@@ -16,6 +16,7 @@ import com.jeelowcode.framework.utils.tool.CollectionUtil;
 import com.jeelowcode.service.infra.service.IFileService;
 import com.jeelowcode.tool.framework.common.pojo.CommonResult;
 import com.jeelowcode.tool.framework.common.util.io.FileUtil;
+import com.jeelowcode.tool.framework.datapermission.core.annotation.DataPermission;
 import com.jeelowcode.tool.framework.security.core.LoginUser;
 import com.jeelowcode.tool.framework.security.core.util.SecurityFrameworkUtils;
 import io.swagger.v3.oas.annotations.Operation;
@@ -43,6 +44,7 @@ import static com.jeelowcode.tool.framework.common.pojo.CommonResult.success;
 @RestController
 @AllArgsConstructor
 @RequestMapping(JeeLowCodeBaseConstant.REQUEST_URL_START + "/outsidePerson")
+@DataPermission(enable=false)
 public class OutSidePersonController extends BaseController {
 
     @Autowired
@@ -296,13 +298,13 @@ public class OutSidePersonController extends BaseController {
                     String targetFieldKey = getCaseInsensitiveKey(updateData, fieldName);
                     String existPath = updateData.getStr(targetFieldKey);
                     if (existPath == null || existPath.isEmpty()) {
-                        updateData.set(targetFieldKey, uploadPath);
+                        updateData.put(fieldName, uploadPath);
                     } else {
-                        updateData.set(targetFieldKey, existPath + "," + uploadPath);
+                        updateData.put(fieldName, existPath + "," + uploadPath);
                     }
 
                     if (statusFieldName != null && !statusFieldName.isEmpty()) {
-                        updateData.set(statusFieldName, "是");
+                        updateData.put(statusFieldName, "是");
                     }
 
                     log.info("处理成功 [{}] - 身份证号: {}, 文件: {}", fieldName, cardId, uploadPath);