diff --git a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java index 78239e849e32ecd703462dbcc80956faed56fbd2..422a38d5dd0f3fd88afd77e91939565f7c747326 100644 --- a/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java +++ b/src/main/java/neatlogic/module/tenant/api/matrix/MatrixColumnDataSearchForTableNewApi.java @@ -225,6 +225,8 @@ public class MatrixColumnDataSearchForTableNewApi extends PrivateApiComponentBas throw new MatrixAttributeNotFoundException(matrixVo.getName(), String.join(",", notFoundColumnList)); } dataVo.setColumnList(columnList); + } else { + throw new ParamNotExistsException("columnList", "columnUniqueIdentifierList"); } } List> tbodyList = matrixDataSourceHandler.searchTableDataNew(dataVo); diff --git a/src/main/java/neatlogic/module/tenant/schedule/plugin/SyncLdapUserSchedule.java b/src/main/java/neatlogic/module/tenant/schedule/plugin/SyncLdapUserSchedule.java index 30d393f59fe9f9e474566739f730fc8471c83f77..7947a3ac2919bfbdc42e056562d504eff9c8ba63 100644 --- a/src/main/java/neatlogic/module/tenant/schedule/plugin/SyncLdapUserSchedule.java +++ b/src/main/java/neatlogic/module/tenant/schedule/plugin/SyncLdapUserSchedule.java @@ -30,6 +30,7 @@ import neatlogic.framework.scheduler.core.PublicJobBase; import neatlogic.framework.scheduler.dto.JobAuditVo; import neatlogic.framework.scheduler.dto.JobObject; import neatlogic.framework.transaction.util.TransactionUtil; +import neatlogic.framework.util.Md5Util; import neatlogic.framework.util.TimeUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -249,6 +250,7 @@ public class SyncLdapUserSchedule extends PublicJobBase { userVo.setLcu(SystemUser.SYSTEM.getUserUuid()); userVo.setLcd(lcd); userVo.setPassword(defaultPassword); + userVo.setToken(Md5Util.encryptMD5(UUID.randomUUID().toString())); this.userMapper.bacthDeleteUserTeamByUserUuid(uuid, "ldap"); this.userMapper.insertUserForLdap(userVo); //人员默认角色