java/haizhentong.git

			@@ -5,6 +5,7 @@
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.query.SysOperLogQuery;
			import com.ruoyi.system.service.ISysOperLogService;
			import com.ruoyi.system.vo.SysOperLogVO;
			@@ -30,11 +31,17 @@
			{
			@Autowired
			private ISysOperLogService operLogService;
			@Autowired
			private TokenService tokenService;

			@ApiOperation(value = "操作日志分页列表")
			@PostMapping("/list")
			public AjaxResult list(@RequestBody SysOperLogQuery query)
			{
			Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
			Long userId = tokenService.getLoginUser().getUserId();
			query.setRoleType(roleType);
			query.setUserId(userId);
			PageInfo<SysOperLogVO> list = operLogService.selectOperLogPageList(query);
			return AjaxResult.success(list);
			}

			@@ -16,4 +16,10 @@
			@ApiModelProperty(value = "操作人员")
			private String nickName;

			@ApiModelProperty(value = "用户id 前端忽略")
			private Long userId;

			@ApiModelProperty(value = "人员类型前端忽略")
			private Integer roleType;

			}

			@@ -119,8 +119,13 @@
			.eq(TCrmBranchLift::getStatus, 1));
			for (TCrmBranchVO tCrmBranchVO : list) {
			List<TCrmBranchArea> tCrmBranchAreas = crmBranchAreaList.stream().filter(t -> t.getBranchId().equals(tCrmBranchVO.getId())).collect(Collectors.toList());
			if(!CollectionUtils.isEmpty(tCrmBranchAreas) && StringUtils.isNotEmpty(tCrmBranchAreas.get(0).getProvinceName())){
			tCrmBranchVO.setProvinceName(tCrmBranchAreas.get(0).getProvinceName()+"/"+tCrmBranchAreas.get(0).getCityName()+"/"+tCrmBranchAreas.get(0).getDistrictName());
			if(!CollectionUtils.isEmpty(tCrmBranchAreas)){
			if(StringUtils.isNotEmpty(tCrmBranchAreas.get(0).getCityName())){
			tCrmBranchVO.setProvinceName(tCrmBranchAreas.get(0).getProvinceName()+"/"+tCrmBranchAreas.get(0).getCityName());
			}
			if(StringUtils.isNotEmpty(tCrmBranchAreas.get(0).getDistrictName())){
			tCrmBranchVO.setProvinceName(tCrmBranchAreas.get(0).getProvinceName()+"/"+tCrmBranchAreas.get(0).getCityName()+"/"+tCrmBranchAreas.get(0).getDistrictName());
			}
			}
			if(!CollectionUtils.isEmpty(crmBranchLifts)){
			long count = crmBranchLifts.stream().filter(t -> t.getBranchId().equals(tCrmBranchVO.getId())).count();

			@@ -51,7 +51,7 @@
			and status = #{query.status}
			</if>
			<if test="query.personType != null">
			and personType = #{query.personType}
			and person_type = #{query.personType}
			</if>
			<if test="query.branchIds != null and query.branchIds.size()>0">
			and id in

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/query/SysOperLogQuery.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TCrmBranchMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史