修改bug'

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonAccountDto.java

@@ -25,7 +25,7 @@ public class PersonAccountDto  extends BaseDto {
 
 
     @ApiModelProperty(value = "平台user_id")
-    private String userId;
+    private String puserId;
 
     @ApiModelProperty(value = "平台账号名称")
     private String accountName;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/UserMapperDto.java

 package com.yeejoin.amos.boot.module.jxiop.api.dto;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.CommonFile;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: tw
@@ -12,7 +19,8 @@ public class UserMapperDto {
 
     private String  sequenceNbr;
     //头像
-    private String  headphoto;
+    private List<CommonFile> photo;
+    private String headPhoto;
     //姓名
     private String  name;
     //性别
@@ -25,4 +33,23 @@ public class UserMapperDto {
     private String   postName;
     //系统账户
     private String  accountName;
+
+    public String getHeadPhoto() {
+        return headPhoto;
+    }
+
+    public void setHeadPhoto(String headPhoto) {
+        this.headPhoto = headPhoto;
+        this.photo= headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+
+    }
+
+    public List<CommonFile> getPhoto() {
+
+        return headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+    }
+
+    public void setPhoto(List<CommonFile> photo) {
+        this.photo =headPhoto!=null? JSON.parseArray(headPhoto,CommonFile.class):null;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAccount.java

@@ -29,8 +29,8 @@ public class PersonAccount extends BaseEntity {
     /**
      * 平台user_id
      */
-	@TableField("user_id")
-    private String userId;
+	@TableField("puser_id")
+    private String puserId;
 
     /**
      * 平台账号名称

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

@@ -73,9 +73,6 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
      * */
     @Transactional
     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();
@@ -146,16 +143,14 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         personCertificateService.save(personCertificate);
         //人员账号信息
         personAccount.setPersonId(personBasic.getSequenceNbr());
-        personAccount.setUserId(agencyUserModel.getUserId());
+        personAccount.setPuserId(agencyUserModel.getUserId());
         personAccountService.save(personAccount);
     }
 
 
     @Transactional
     public PersonDto updatePerson(PersonDto model, HttpServletRequest httpServletRequest,Long sequenceNbr) {
-        String appKey = httpServletRequest.getHeader("appKey");
-        String product = httpServletRequest.getHeader("product");
-        String token = httpServletRequest.getHeader("token");
+
 
         //获取人员基本信息数据
         PersonUser personUser = model.getPersonUser();
@@ -190,8 +185,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         //账号
         usd.setUserName(personAccount.getAccountName());
         usd.setLockStatus("UNLOCK");
+        usd.setUserId(personAccount.getPuserId());
         //新增平台用户
-        AgencyUserModel agencyUserModel=this.updateuser(personAccount.getUserId(),usd);
+        AgencyUserModel agencyUserModel=this.updateuser(personAccount.getPuserId(),usd);
         //查询部门
         DepartmentModel departmentModel=null;
         if(personUser.getDepartmentId()!=null){
@@ -278,7 +274,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         List<PersonAccount>  list=personAccountService.list(wrapper);
         List<String> userid=new ArrayList<>();
         for (PersonAccount personAccount : list) {
-            userid.add(personAccount.getUserId());
+            userid.add(personAccount.getPuserId());
         }
          //删除平台
          this.deleuser(String.join(",",userid));