From 55cfac650994a255763a1f36509a2d237e7ccac2 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 09:50:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=20=EF=BC=8C=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=AD=A3=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/adc/da/sys/controller/UserEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index ef755dd..04166e5 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -99,7 +99,7 @@ public class UserEOController extends BaseController { } if (StringUtils.isNotBlank(eo.getCellPhoneNumber())) { - if (!eo.getCellPhoneNumber().matches("^[1][3,4,5,7,8,9][0-9]{9}$")) { + if (!eo.getCellPhoneNumber().matches("^(?:\\+86)?-(1[3456789]\\d)\\d{8}$")) { return Result.error("手机号不符合规则！"); } } From 1d2f29477b150992d3f7571134e4772915dbbedd Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 18 May 2023 10:04:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DBug=E3=80=9069372?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 报告管理--编辑时，第一次保存到了草稿，第二次发起编辑后，报告管理中多了一条数据 --- .../main/resources/mybatis/mapper/mysql/ReportManageMapper.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 0a36a01..a4a6f44 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -224,6 +224,8 @@ and t.createUserId=#{Vo.usid} + GROUP BY + t.id ORDER BY updateDate desc From e4ee26b17697f475e995d4515a4cd632aa079044 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 10:27:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9D=83=E9=99=90=E7=A7=81=E6=9C=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/report/service/impl/IReportServiceImpl.java | 2 +- .../main/resources/mybatis/mapper/mysql/ReportManageMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 049c671..4affcd8 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -452,7 +452,7 @@ public class IReportServiceImpl extends ServiceImpl idSet.add("默认搜索条件"); } } - + vo.setUsid(UserUtils.getUserId()); IPage list = reportDao.page(page, vo, idSet); //设置权限 diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 0a36a01..6ba7467 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -114,7 +114,7 @@ downloadCount.download AS download, AVG( trur.user_rating ) AS reportRating, IF(bpn.id is null,1, - IF(bpn.SUBMIT_STATUS = 1,0,1) + IF(bpn.SUBMIT_STATUS = 1 and bpn.CREAT_USER = #{pageVO.usid} ,0,1) ) as isAct FROM TT_REPORT_MANAGE eo From d9ca17ce3f630f363b16c6acec841b4a00f9d070 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 11:25:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/sys/service/UserEOServiceImpl.java | 9 +++------ .../resources/mybatis/mapper/sys/mysql/UserEOMapper.xml | 4 ++-- .../business_activiti/task/TodoTaskController.java | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 8751dc6..e6ad481 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -22,23 +22,18 @@ import com.adc.da.util.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.enums.SqlMethod; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.metadata.TableInfo; -import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.binding.MapperMethod; import org.apache.ibatis.session.SqlSession; -import org.apache.poi.ss.formula.functions.T; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -144,6 +139,8 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEO.setRoleId(c); userRoleEODao.insert(userRoleEO); }); + //保存用户部门关系表 + userOrgEODao.deleteBatchByUserIds(Collections.singletonList(eo.getUsid())); if (StringUtils.isNotEmpty(eo.getOrgId())){ String[] split = eo.getOrgId().split(","); // 插入组织关联表 暂时用不上,页面不维护组织机构 diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index 68a3a34..fef279e 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -5,8 +5,8 @@