Merge remote-tracking branch 'origin/fourthStage' into fourthStage

This commit is contained in:
yjz
2024-02-05 17:05:26 +08:00
@@ -1,7 +1,10 @@
package com.jero.modules.projectLibrary.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.api.vo.ResultCommon;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.vo.LoginUser;
import com.jero.modules.laws.common.util.CurrentUserUtil;
import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
@@ -123,7 +126,16 @@ public class LawsSpecialProjectLibraryServiceImpl extends ServiceImpl<LawsSpecia
*/
@Override
public void deleteByIds(List<String> ids) {
removeByIds(ids);
LoginUser loginUser = CurrentUserUtil.getLoginUser();
List<LawsSpecialProjectLibrary> projectLibraryList = this.listByIds(ids);
for (LawsSpecialProjectLibrary projectLibrary : projectLibraryList) {
String createBy = projectLibrary.getCreateBy();
//管理员和创建人可以删除
if (!loginUser.getIsAdmin() && !loginUser.getId().equals(createBy)){
throw new JeroBootException(ResultCommon.NO_PERMISSIONS_PLEASE_SELECT);
}
}
removeByIds(ids);
}
/**