Commit 131442a4 by 邓实川 Committed by chenzg

bug修复

parent 210d3c10
......@@ -93,4 +93,7 @@ public class QyzxUseRecord extends Model<QyzxUseRecord> {
@ApiModelProperty(value = "流程id(合同) ", example = "")
private String flowId;
@ApiModelProperty(value = "合同名称 ", example = "")
private String flowName;
}
......@@ -511,6 +511,7 @@ public class DzhtController2 {
qyzxUseRecord.setScene("签署中");
qyzxUseRecord.setPmid(2);
qyzxUseRecord.setFlowId(flowId);
qyzxUseRecord.setFlowName(f);
qyzxUseRecord.insert();
quantity.setRemainder(remainder);
......
......@@ -150,7 +150,6 @@ public class QyzxAuthController {
QyzxAuthAccount qyzxAuthAccount = QyzxAuthAccount.builder().build().selectOne(
new QueryWrapper<QyzxAuthAccount>().lambda().eq(QyzxAuthAccount::getOrgCode, userBean.getOrgCode())); // 主账号
map.put("mainAccount", qyzxAuthAccount);
list.add(map);
List<QyzxAuthChild> childs = QyzxAuthChild.builder().build().selectList(new QueryWrapper<QyzxAuthChild>()
.lambda().eq(QyzxAuthChild::getOrgCode, userBean.getOrgCode()).ne(QyzxAuthChild::getIsDel, 1)); // 子账号
......@@ -164,9 +163,8 @@ public class QyzxAuthController {
YgglMainEmp::getPhone, YgglMainEmp::getEmpNum)); // 子账号员工信息
list2.add(ygglMainEmp);
}
Map<String, Object> map2 = new HashedMap<String, Object>();
map2.put("childAccount", list2);
list.add(map2);
map.put("childAccount", list2);
list.add(map);
return ResultUtil.data(list, "查询成功");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment