commit
This commit is contained in:
@@ -196,7 +196,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
|
|||||||
u.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), salt));
|
u.setPassword(PwdUtil.getPassword(PwdUtil.generate(12), salt));
|
||||||
|
|
||||||
if (u.getMember()) {
|
if (u.getMember()) {
|
||||||
addMemberUserIds.add(u.getId());
|
//addMemberUserIds.add(u.getId());
|
||||||
}
|
}
|
||||||
needInitUserList.add(u);
|
needInitUserList.add(u);
|
||||||
} else {
|
} else {
|
||||||
@@ -207,9 +207,9 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
|
|||||||
boolean currentIsMember = user.getMember() != null && user.getMember();
|
boolean currentIsMember = user.getMember() != null && user.getMember();
|
||||||
|
|
||||||
if (!currentIsMember) {
|
if (!currentIsMember) {
|
||||||
addMemberUserIds.add(user.getId());
|
//addMemberUserIds.add(user.getId());
|
||||||
} else{
|
} else{
|
||||||
removeMemberUserIds.add(user.getId());
|
//removeMemberUserIds.add(user.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
needDoUpdateList.add(u);
|
needDoUpdateList.add(u);
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ layout("/layouts/platform.html"){
|
|||||||
<el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="position" label="干部职务" sortable width="120" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
|
<el-table-column prop="education" label="学历" show-overflow-tooltip sortable width="120"></el-table-column>
|
||||||
<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
|
<el-table-column prop="academicDegree" label="学位" show-overflow-tooltip sortable width="120"></el-table-column>
|
||||||
<el-table-column prop="unitName" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
|
<el-table-column prop="unit_name" label="单位" show-overflow-tooltip sortable width="120"></el-table-column>
|
||||||
<el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
|
<el-table-column prop="unitId" label="单位编码" sortable width="120"></el-table-column>
|
||||||
<el-table-column prop="political" label="政治面貌" sortable></el-table-column>
|
<el-table-column prop="political" label="政治面貌" sortable></el-table-column>
|
||||||
<el-table-column prop="nation" label="民族" sortable></el-table-column>
|
<el-table-column prop="nation" label="民族" sortable></el-table-column>
|
||||||
|
|||||||
Reference in New Issue
Block a user