c-zhangr1/zhgh_ysu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
c-zhangr1
2026-07-02 16:56:29 +08:00
parent 9c31bf8153
commit 0083cfeed4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/sys/controller/SysDataUserPullController.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class SysDataUserPullController {
@ApiOperation("分页数据") @ApiOperation("分页数据")
@Ok("json:{locked:'password|idCard'}") @Ok("json:{locked:'password|idCard'}")
public Result pageData(@Valid SysDataUserPullPageForm pageForm) { public Result pageData(@Valid SysDataUserPullPageForm pageForm) {
Sql sql = Sqls.create("select us.*,su.`name` AS unitName from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition"); Sql sql = Sqls.create("select us.*,su.`name` AS unit_name from sys_user_source us left join sys_unit su ON su.id = us.unitId $condition");
Cnd cnd = Cnd.NEW(); Cnd cnd = Cnd.NEW();
cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime()); cnd.andEX(Sys_user_source::getPullTime, "=", pageForm.getPullTime());
cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName())); cnd.and(Cnd.likeEX(Sys_user_source::getUsername, pageForm.getUserName()));
src/main/resources/views/platform/sys/data/user/pull.html
+1 -1
View File
@@ -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>