|
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
|
|
public class ApplyAgencyAuthCommand{
|
|
public class ApplyAgencyAuthCommand{
|
|
|
|
|
|
@NotNull(message = "身份证号码不能为空")
|
|
@NotNull(message = "身份证号码不能为空")
|
|
- private String IdCardNum;
|
|
|
|
|
|
+ private String idCardNum;
|
|
|
|
|
|
@NotNull(message = "请选择性别")
|
|
@NotNull(message = "请选择性别")
|
|
private String sex;
|
|
private String sex;
|
|
@@ -49,14 +49,14 @@ public class ApplyAgencyAuthCommand{
|
|
public EvaluationAgency toAgency(){
|
|
public EvaluationAgency toAgency(){
|
|
EvaluationAgency agency = UserFactory.defaultAgency();
|
|
EvaluationAgency agency = UserFactory.defaultAgency();
|
|
BeanUtils.copyProperties(this, agency, "evaluationAgencyAbilityList", "evaluationAgencyResourceList");
|
|
BeanUtils.copyProperties(this, agency, "evaluationAgencyAbilityList", "evaluationAgencyResourceList");
|
|
- if(this.evaluationAgencyAbilityList.size() > 0 && this.evaluationAgencyAbilityList != null){
|
|
|
|
- agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
- if(this.evaluationAgencyResourceList.size() > 0 && this.evaluationAgencyResourceList != null){
|
|
|
|
- agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
|
|
|
|
- agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
|
|
|
|
- }
|
|
|
|
|
|
+// if(this.evaluationAgencyAbilityList.size() > 0 && this.evaluationAgencyAbilityList != null){
|
|
|
|
+// agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
|
|
|
|
+//
|
|
|
|
+// }
|
|
|
|
+// if(this.evaluationAgencyResourceList.size() > 0 && this.evaluationAgencyResourceList != null){
|
|
|
|
+// agency.setEvaluationAgencyAbilityList(this.evaluationAgencyAbilityList.stream().map(EvaluationAgencyAbility::new).collect(Collectors.toList()));
|
|
|
|
+// agency.setEvaluationAgencyResourceList(this.evaluationAgencyResourceList.stream().map(AgencyResourceCommand::toAgencyResource).collect(Collectors.toList()));
|
|
|
|
+// }
|
|
agency.setType(JSONObject.toJSONString(this.roleList));
|
|
agency.setType(JSONObject.toJSONString(this.roleList));
|
|
agency.setIsDeleted(0);
|
|
agency.setIsDeleted(0);
|
|
agency.setIsAuthentication(0);
|
|
agency.setIsAuthentication(0);
|