diff --git a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java index 5a097ed4..72e2980c 100644 --- a/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java +++ b/src/main/java/com/spring/modules/part/entity/PartInformationEntity.java @@ -394,4 +394,6 @@ public class PartInformationEntity extends QueryPage implements Serializable { * 临时物料标识 */ private String temporaryPartFlag; + + private String copyPartNo; } diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index 8f7311e9..b3aade72 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -1844,6 +1844,9 @@ public class PartInformationServiceImpl extends ServiceImpl accessSiteDataList = sysUserService.checkAccessSite(form.getSite(), user.getUsername()); - if (accessSiteDataList.size() == 0) { + if (accessSiteDataList.isEmpty()) { return R.error("账号没有所选工厂的权限,请联系管理员!"); } } - }else{ + } else { user = sysUserService.queryByUserName(form.getUsername()); //账号不存在、密码错误 if(user == null || !user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) { diff --git a/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java b/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java index 1831e3ef..ad5ed9c2 100644 --- a/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java +++ b/src/main/java/com/spring/modules/sys/utils/CustomerLdapUtils.java @@ -57,7 +57,7 @@ public class CustomerLdapUtils { .and("sAMAccountName").is(username), mapper); //判断用户是否能找到 - if(resultList.size() > 0) { + if(!resultList.isEmpty()) { try { ldapTemplate.authenticate(LdapQueryBuilder.query().where("objectClass").isPresent() .and("sAMAccountName").is(username), password);