解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -42,8 +42,8 @@ public class PersonBasicController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save")
 	@ApiOperation(httpMethod = "POST", value = "新增人员基本信息", notes = "新增人员基本信息")
-	public ResponseModel<Object> save(@RequestBody PersonDto model) {
-	    personBasicServiceImpl.addPerson(model);
+	public ResponseModel<Object> save(@RequestBody PersonDto model,HttpServletRequest httpServletRequest) {
+	    personBasicServiceImpl.addPerson(model,httpServletRequest);
 	    return ResponseHelper.buildResponse(null);
 	}
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -20,6 +20,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -66,7 +68,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
      * 新增
      * */
     @Transactional
-    public void addPerson(PersonDto model){
+    public void addPerson(PersonDto model, HttpServletRequest httpServletRequest){
+        String appKey = httpServletRequest.getHeader("appKey");
+        String product = httpServletRequest.getHeader("product");
+        String token = httpServletRequest.getHeader("token");
+
         //获取人员基本信息数据
         PersonUser personUser =model.getPersonUser();
         //获取人员资质信息