This commit is contained in:
齐天大圣 2024-03-29 15:56:55 +08:00
parent 8cd1c2c7a2
commit bc01b68b65

View File

@ -11,6 +11,7 @@ import com.fuint.common.util.TokenUtil;
import com.fuint.system.dept.entity.SysDept;
import com.fuint.system.dept.service.ISysDeptService;
import com.fuint.system.role.entity.TDuty;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -64,6 +65,7 @@ public class LJDutyServiceImpl extends ServiceImpl<LJDutyMapper, TDuty> implemen
@Override
public Page<TDuty> selectDutyPage(Page page, TDuty duty) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
/*if (ObjectUtil.isNotEmpty(duty.getStoreId())){
SysDept sysDept = sysDeptService.selectParentId(Long.valueOf(duty.getStoreId()));
duty.setStoreId(Math.toIntExact(sysDept.getDeptId()));
@ -72,7 +74,12 @@ public class LJDutyServiceImpl extends ServiceImpl<LJDutyMapper, TDuty> implemen
SysDept sysDept = sysDeptService.selectParentId(nowAccountInfo.getDeptId());
duty.setStoreId(Math.toIntExact(sysDept.getDeptId()));
}*/
duty.setStoreId(duty.getStoreId());
if (ObjectUtils.isNotEmpty(duty.getStoreId())){
duty.setStoreId(duty.getStoreId());
}else {
duty.setStoreId(Integer.parseInt(nowAccountInfo.getDeptId().toString()));
}
return baseMapper.selectDutyPage(page,duty);
}