From c9520071522dbd2929f4f8e28ce8b70712a2e5e8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 03 Jan 2024 18:13:44 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 6 +
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 71 ++++++++++-------
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 71 ++++++++++++++++-
src/main/java/org/springblade/modules/task/service/ITaskService.java | 8 +
src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java | 16 ++-
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 32 +++++---
src/main/java/org/springblade/modules/task/controller/TaskController.java | 4
src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java | 5
src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java | 5
9 files changed, 157 insertions(+), 61 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
index 83a1157..84b9c38 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/entity/DoorplateAddressEntity.java
@@ -22,11 +22,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
+import lombok.Data;
import java.io.Serializable;
@@ -99,6 +97,7 @@
* 乡镇街道编号
*/
@ApiModelProperty(value = "乡镇街道编号")
+ @TableField("town_street_code")
private String townStreetCode;
/**
* 乡镇街道名称
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index b7420bd..45dab58 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -19,8 +19,14 @@
jczz_place_ext jpe
LEFT JOIN jczz_place jp ON jpe.place_id = jp.id
AND jp.is_deleted = 0
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code=jp.house_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id
WHERE
jpe.is_deleted = 0
+ <if test="placeExt.communityCode != null and placeExt.communityCode != ''">
+ and jg.community_code=#{placeExt.communityCode}
+ </if>
+
<if test="placeExt.placeName != null and placeExt.placeName != ''">
and jp.place_name like concat('%',#{placeExt.placeName},'%')
</if>
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 4f040df..e1237ea 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -17,26 +17,23 @@
package org.springblade.modules.place.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.house.entity.HouseTenantEntity;
-import org.springblade.modules.house.vo.HouseTenantVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
+import org.springblade.modules.place.mapper.PlaceExtMapper;
+import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlacePractitionerService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceExtVO;
-import org.springblade.modules.place.mapper.PlaceExtMapper;
-import org.springblade.modules.place.service.IPlaceExtService;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.modules.task.entity.TaskEntity;
-import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@@ -54,9 +51,6 @@
public class PlaceExtServiceImpl extends ServiceImpl<PlaceExtMapper, PlaceExtEntity> implements IPlaceExtService {
@Autowired
- private ITaskService taskService;
-
- @Autowired
private IPlaceService placeService;
@Autowired
@@ -65,8 +59,12 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义查询
+ *
* @param page
* @param placeExt
* @return
@@ -74,20 +72,29 @@
@Override
public IPage<PlaceExtVO> selectPlaceExtPage(IPage<PlaceExtVO> page, PlaceExtVO placeExt) {
List<String> list = new ArrayList<>();
- if (null!=placeExt.getRoleName() && !placeExt.getRoleName().equals("")){
- if (placeExt.getRoleName().equals("网格员")){
+ if (null != placeExt.getRoleName() && !placeExt.getRoleName().equals("")) {
+ if (placeExt.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
- if (!placeExt.getRoleName().equals("系统管理员")){
+ if (!placeExt.getRoleName().equals("系统管理员")) {
placeExt.setCreateUser(AuthUtil.getUserId());
}
}
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,list));
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ placeExt.setCommunityCode(dept.getRegionCode());
+ }
+ if (AuthUtil.getUserAccount().equals("18879306957")) {
+ placeExt.setCommunityCode("361102003027");
+ placeExt.setCreateUser(null);
+ }
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt, list));
}
/**
* 场所详情表 自定义更新
+ *
* @param placeExt
* @return
*/
@@ -107,7 +114,7 @@
updatePlaceInfo(placeExt);
// 查询对应已存在的从业人员
QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("place_id",placeExt.getPlaceId());
+ wrapper.eq("place_id", placeExt.getPlaceId());
List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
// 申明新增，修改，删除集合
@@ -118,16 +125,16 @@
// 找出需要新增的，否则组成新集合进行比对
for (PlacePractitionerEntity practitionerEntity : list) {
practitionerEntity.setPlaceId(placeExt.getPlaceId());
- if (null==practitionerEntity.getId()){
+ if (null == practitionerEntity.getId()) {
// 新增
- PlacePractitionerEntity placePractitionerEntity= new PlacePractitionerEntity();
+ PlacePractitionerEntity placePractitionerEntity = new PlacePractitionerEntity();
placePractitionerEntity.setPlaceId(placeExt.getPlaceId());
placePractitionerEntity.setName(practitionerEntity.getName());
placePractitionerEntity.setTelephone(practitionerEntity.getTelephone());
placePractitionerEntity.setTempAddress(practitionerEntity.getTempAddress());
addList.add(placePractitionerEntity);
- }else {
+ } else {
newList.add(practitionerEntity);
}
}
@@ -140,15 +147,15 @@
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
// 批量新增
- if (addList.size()>0) {
+ if (addList.size() > 0) {
addFlag = placePractitionerService.saveBatch(addList);
}
// 批量修改
- if (updateList.size()>0) {
+ if (updateList.size() > 0) {
updateFlag = placePractitionerService.updateBatchById(updateList);
}
// 批量删除
- if (removeList.size()>0) {
+ if (removeList.size() > 0) {
removeFlag = placePractitionerService.removeBatchByIds(removeList);
}
// 返回
@@ -157,6 +164,7 @@
/**
* 更新场所表信息
+ *
* @param placeExt
*/
public void updatePlaceInfo(PlaceExtVO placeExt) {
@@ -178,6 +186,7 @@
/**
* 场所详情表 审核
+ *
* @param placeExt
* @return
*/
@@ -204,6 +213,7 @@
/**
* 场所详情表 新增
+ *
* @param placeExt
* @return
*/
@@ -220,26 +230,27 @@
// boolean save = taskService.save(taskEntity);
// if (save){
// placeExt.setTaskId(taskEntity.getId());
- placeExt.setConfirmFlag(1);
- placeExt.setCreateTime(new Date());
- placeExt.setUpdateTime(new Date());
- placeExt.setCreateUser(AuthUtil.getUserId());
- placeExt.setUpdateUser(AuthUtil.getUserId());
- // 新增场所详情
- boolean save = save(placeExt);
+ placeExt.setConfirmFlag(1);
+ placeExt.setCreateTime(new Date());
+ placeExt.setUpdateTime(new Date());
+ placeExt.setCreateUser(AuthUtil.getUserId());
+ placeExt.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ boolean save = save(placeExt);
// }
return save;
}
/**
* 场所详情表 自定义详情
+ *
* @param placeExt
* @return
*/
@Override
public PlaceExtVO getDetail(PlaceExtVO placeExt) {
PlaceExtVO detail = baseMapper.getDetail(placeExt);
- if (null!=detail) {
+ if (null != detail) {
// 查询从业人员信息
QueryWrapper<PlacePractitionerEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("place_id", placeExt.getPlaceId());
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
index c8d79b9..a34d8b3 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceExtVO.java
@@ -17,10 +17,9 @@
package org.springblade.modules.place.vo;
import io.swagger.annotations.ApiModelProperty;
-import org.springblade.modules.place.entity.PlaceExtEntity;
-import org.springblade.core.tool.node.INode;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.entity.PlacePractitionerEntity;
import java.util.ArrayList;
@@ -79,4 +78,6 @@
@ApiModelProperty("结束时间")
private String endTime;
+ private String communityCode;
+
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index 3997257..fa0465b 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -94,11 +94,11 @@
/**
* 任务表 修改
*/
- @PostMapping("/update")
+ @PostMapping("/removeTask")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入task")
public R update(@Valid @RequestBody TaskEntity task) {
- return R.status(taskService.updateById(task));
+ return R.status(taskService.removeTask(task));
}
/**
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
index 5a7799a..c92394f 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskCampusReportingEventEntity.java
@@ -21,12 +21,11 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.util.Date;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
/**
* 校园安全检查任务表 实体类
@@ -201,14 +200,21 @@
@TableField("high_altitude_monitor")
private String highAltitudeMonitor;
- /** 高空抛物监控照片 */
+ /**
+ * 高空抛物监控照片
+ */
@ApiModelProperty(value = "高空抛物监控照片", example = "")
@TableField("ha_image_urls")
private String haImageUrls;
- /** 四个一工程照片 */
+ /**
+ * 四个一工程照片
+ */
@ApiModelProperty(value = "四个一工程照片", example = "")
@TableField("fo_image_urls")
private String foImageUrls;
+ @ApiModelProperty("是否已删除")
+ private Integer isDeleted;
+
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 4e1af03..8c46635 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -22,9 +22,9 @@
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- IFNULL(jda.address_name,jp.location)address_name ,
+ IFNULL( jda.address_name, jp.location ) address_name,
jt.id,
- jt.name,
+ jt.NAME,
jt.type,
jt.frequency,
jt.remark,
@@ -32,26 +32,33 @@
jt.create_user,
jt.update_time,
jt.update_user,
- jt.status,
+ jt.STATUS,
jt.tenant_id,
jt.create_dept,
jt.is_deleted,
jt.house_code,
jt.report_type
FROM
- jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
- LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
+ jczz_task jt
LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
- LEFT JOIN jczz_place jp on jp.house_code=jgr.house_code
+ LEFT JOIN jczz_place jp ON jp.house_code = jt.house_code
<where>
<if test="task.userId != null and task.userId != ''">
- and jgm.user_id = #{task.userId}
+ AND jt.house_code IN (
+ SELECT
+ jgr.house_code
+ FROM
+ jczz_grid_range jgr
+ LEFT JOIN jczz_grid jg ON jg.id = jgr.grid_id
+ LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ WHERE
+ jg.is_deleted = 0
+ <if test="task.communityCode != null and task.communityCode != ''">
+ and jg.community_code = #{task.communityCode}
+ </if>
+ AND jgm.user_id = #{task.userId} )
</if>
- <if test="task.communityCode != null and task.communityCode != ''">
- and jg.community_code = #{task.communityCode}
- </if>
+
<if test="task.status != null and task.status != null">
and jt.status = #{task.status}
</if>
@@ -86,6 +93,7 @@
<if test="task.reportType == null">
and jt.report_type in (2,3,4,5,6)
</if>
+ and jt.is_deleted = 0
order by jt.create_time desc
</where>
</select>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskService.java b/src/main/java/org/springblade/modules/task/service/ITaskService.java
index 35b7ca7..1018c98 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -59,11 +59,13 @@
* @param id
* @return
*/
- public Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status);
+ Long updateTask(Integer type, String name, Integer frequency, String remark, Long updateUser, Long id, Integer status);
- Object countNumber(String houseCode, Integer status);
+ Object countNumber(String houseCode, Integer status);
- Object countTypeNumber(Integer roleType,String neiCode);
+ Object countTypeNumber(Integer roleType, String neiCode);
Object countFrequencyNumber();
+
+ Boolean removeTask(TaskEntity task);
}
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index acc0bdd..23e6157 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
@@ -26,10 +27,11 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.place.service.IPlaceExtService;
-import org.springblade.modules.task.entity.TaskEntity;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.task.entity.*;
import org.springblade.modules.task.mapper.TaskMapper;
-import org.springblade.modules.task.service.ITaskReportForRepairsService;
-import org.springblade.modules.task.service.ITaskService;
+import org.springblade.modules.task.service.*;
import org.springblade.modules.task.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -57,9 +59,16 @@
@Autowired
private IHouseRentalService iHouseRentalService;
+
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
- task.setUserId(AuthUtil.getUserId());
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null != dept) {
+ task.setCommunityCode(dept.getRegionCode());
+ }
// 民警角色
if (AuthUtil.getUserRole().equals("mj")) {
task.setUserId(AuthUtil.getUserId());
@@ -68,6 +77,9 @@
if (AuthUtil.getUserAccount().equals("18879306957")) {
task.setCommunityCode("361102003027");
task.setUserId(null);
+ }
+ if (AuthUtil.getUserRole().equals("wgy")) {
+ task.setUserId(AuthUtil.getUserId());
}
// 非民警角色
List<TaskVO> taskVOS = baseMapper.selectTaskPage(page, task);
@@ -121,6 +133,7 @@
LambdaQueryWrapper<TaskEntity> objectQueryWrapper = new LambdaQueryWrapper<>();
objectQueryWrapper.eq(TaskEntity::getCreateUser, AuthUtil.getUserId());
objectQueryWrapper.isNotNull(TaskEntity::getHouseCode);
+ objectQueryWrapper.eq(TaskEntity::getIsDeleted, 0);
objectQueryWrapper.in(TaskEntity::getReportType, 2, 3, 4, 5, 6);
if (StringUtils.isNotBlank(houseCode)) {
objectQueryWrapper.eq(TaskEntity::getHouseCode, houseCode);
@@ -142,6 +155,7 @@
taskVO.setUserId(roleType > 0 ? AuthUtil.getUserId() : null);
taskVO.setNeiCode(neiCode);
taskVO.setReportType(2);
+ taskVO.setIsDeleted(0);
// 标签事件
Integer bqsj = baseMapper.selectTaskCount(taskVO);
taskVO.setReportType(1);
@@ -181,4 +195,53 @@
objectObjectHashMap.put("periodicity", periodicity);
return objectObjectHashMap;
}
+
+ @Override
+ public Boolean removeTask(TaskEntity task) {
+
+ boolean update1 = update(Wrappers.<TaskEntity>lambdaUpdate()
+ .set(TaskEntity::getIsDeleted, 1)
+ .eq(TaskEntity::getId, task.getId()));
+ if (update1) {
+ if (task.getReportType().equals(1)) {
+ ITaskBailReportingEventService bean = SpringUtils.getBean(ITaskBailReportingEventService.class);
+ boolean update = bean.update(Wrappers.<TaskBailReportingEventEntity>lambdaUpdate()
+ .set(TaskBailReportingEventEntity::getIsDeleted, 1)
+ .eq(TaskBailReportingEventEntity::getTaskId, task.getId()));
+ return update;
+ } else if (task.getReportType().equals(2)) {
+ ITaskHotelReportingService bean = SpringUtils.getBean(ITaskHotelReportingService.class);
+ boolean update = bean.update(Wrappers.<TaskHotelReportingEntity>lambdaUpdate()
+ .set(TaskHotelReportingEntity::getIsDeleted, 1)
+ .eq(TaskHotelReportingEntity::getTaskId, task.getId()));
+ return update;
+ } else if (task.getReportType().equals(3)) {
+ ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
+ boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
+ .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
+ .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
+ return update;
+ } else if (task.getReportType().equals(4)) {
+ ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
+ boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
+ .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
+ .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
+ return update;
+ } else if (task.getReportType().equals(5)) {
+ ITaskLabelReportingEventService bean = SpringUtils.getBean(ITaskLabelReportingEventService.class);
+ boolean update = bean.update(Wrappers.<TaskLabelReportingEventEntity>lambdaUpdate()
+ .set(TaskLabelReportingEventEntity::getIsDeleted, 1)
+ .eq(TaskLabelReportingEventEntity::getTaskId, task.getId()));
+ return update;
+ } else if (task.getReportType().equals(6)) {
+ ITaskCampusReportingEventService bean = SpringUtils.getBean(ITaskCampusReportingEventService.class);
+ boolean update = bean.update(Wrappers.<TaskCampusReportingEventEntity>lambdaUpdate()
+ .set(TaskCampusReportingEventEntity::getIsDeleted, 1)
+ .eq(TaskCampusReportingEventEntity::getTaskId, task.getId()));
+ return update;
+ }
+ }
+
+ return update1;
+ }
}
--
Gitblit v1.9.3