Commit 305f7635 by huluobin

# fee

parent f247ea9a
......@@ -412,9 +412,9 @@ public abstract class AbstractCostService implements CostService {
if (com.bailuntec.common.StringUtils.isNotEmpty(req.getKey())) {
req.setKeys(Lists.newArrayList(req.getKey().split(",")));
}
UserDomain userDomain = userService.findByUserid(req.getCreateUserid());
UserDomain userDomain = userService.findByUserid((Integer) req.getCurrentUserId());
if (userDomain.getIsadmin() > 0 || userDomain.getIsfinansys() > 0) {
req.setCreateUserid(null);
req.setCurrentUserId(null);
}
Page<CostDomain> page = costDao.queryPage(new Page<>(req.getPageNum(), req.getPageSize()), req);
this.setPrimaryDepartment(page.getRecords());
......
......@@ -310,6 +310,7 @@
<if test=" req.isLend!=null and req.isLend != ''">and t1.is_lend=#{req.isLend}</if>
<if test=" req.companyNo!=null and req.companyNo != ''">and t1.company_no=#{req.companyNo}</if>
<if test=" req.createUserid!=null ">and t1.create_userid=#{req.createUserid}</if>
<if test=" req.currentUserId!=null ">and t1.create_userid=#{req.currentUserId}</if>
<if test=" req.costStatus!=null ">and find_in_set(t1.cost_status,#{req.costStatus})</if>
<if test=" req.lendStatus!=null ">and t1.lend_status=#{req.lendStatus}</if>
<if test=" req.isTax!=null ">and t1.is_tax=#{req.isTax}</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment