Merge remote-tracking branch 'origin/master'
This commit is contained in:
+4
-13
@@ -115,8 +115,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
|
public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
|
||||||
List<String> baseIdList = Arrays.asList(dummyInventoryBaseEO.getId().split(","));
|
DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
|
||||||
List<DummyInventoryBaseEO> baseEOList = listByIds(baseIdList);
|
|
||||||
List<String> createByNameList =new ArrayList<>();
|
List<String> createByNameList =new ArrayList<>();
|
||||||
if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
|
if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
|
||||||
createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
|
createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
|
||||||
@@ -125,20 +124,12 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
|||||||
// 增加创建者校验
|
// 增加创建者校验
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
String loginUserName = sysUser.getUsername();
|
String loginUserName = sysUser.getUsername();
|
||||||
StringBuilder messageBuilder = new StringBuilder();
|
|
||||||
for (DummyInventoryBaseEO baseEO : baseEOList) {
|
|
||||||
if (!baseEO.getCreateBy().contains(loginUserName)) {
|
|
||||||
messageBuilder.append(baseEO.getName()).append(",");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(messageBuilder)) {
|
if (!baseEO.getCreateBy().contains(loginUserName)) {
|
||||||
String message = messageBuilder.substring(0, messageBuilder.length() - 1);
|
|
||||||
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
|
if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
|
||||||
throw new JeroBootException("当前用户非" + message + "的创建者,无法编辑");
|
throw new JeroBootException("当前用户非创建者,无法编辑");
|
||||||
} else {
|
} else {
|
||||||
throw new JeroBootException(
|
throw new JeroBootException("The current user is not the creator and cannot be edited.");
|
||||||
"The current user is not the creator of " + message + " and cannot be edited.");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user