代码初始化

jiangping

2025-04-15 3cea15af53d4eb5fb9ccdd1b7a31ec494ba41d6c

代码初始化

 admin/src/views/business/companyMember.vue

@@ -46,7 +46,14 @@
          </template>
        </el-table-column>
        <el-table-column prop="email" label="邮箱" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="150px"></el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="150px">
          <template slot-scope="{row}">
            <div v-if="row.companyNameList && row.companyNameList.length">
              <div  v-for="item in row.companyNameList" :key="item.id" style="display: block;margin-right: 20px">{{item}}
              </div>
            </div>
          </template>
        </el-table-column>
        <el-table-column prop="editorName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="最后操作时间" min-width="150px"></el-table-column>
      </el-table>

 server/src/main/java/com/doumee/dao/business/model/Member.java

@@ -104,5 +104,8 @@
    @ApiModelProperty(value = "用户所属组织集合")
    @TableField(exist = false)
    private List<Company> companyList;
    @ApiModelProperty(value = "用户所属组织名称集合")
    @TableField(exist = false)
    private String[] companyNameList;

}

 server/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -208,7 +208,15 @@
            queryWrapper.exists(pageWrap.getModel().getCompanyId()!=null,"select (cm.id) from company_member cm where cm.company_id='"+pageWrap.getModel().getCompanyId()+"'  and cm.member_id=t.id");
        }
        queryWrapper.orderByAsc(Member::getCreateDate);
        return PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
        PageData<Member> record =  PageData.from(memberMapper.selectJoinPage(page,Member.class, queryWrapper));
        if(record!=null && record.getRecords()!=null){
            for(Member m : record.getRecords()){
                if(StringUtils.isNotBlank(m.getCompanyName())){
                    m.setCompanyNameList(m.getCompanyName().split(","));
                }
            }
        }
        return  record;
    }

    @Override
@@ -278,7 +286,7 @@
                        if(StringUtils.isNotBlank(comNames)){
                            comNames += ",";
                        }
                        comNames += c.getName();
                        comNames += c.getNamePath();
                    }
                }
                cm.setCompanyList(qycom);

 server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java

@@ -956,7 +956,7 @@

    private Map<String, String> getEmailContentFormByModel(Workorder workorder) {
        Map<String, String>  map =  new LinkedHashMap<>();
        map.put("上报人",workorder.getMemberName()+"/" +workorder.getCompanyName());
        map.put("上报人",workorder.getCompanyName()+"/" +workorder.getMemberName());
        map.put("上报时间",DateUtil.getPlusTime2(workorder.getSubmitDate()));
        map.put("事件发生时间/地点",DateUtil.getPlusTime2(workorder.getHappenTime())+"/"+workorder.getLocationName());
        map.put("伤害类型", workorder.getTypeName());