Merge branch 'lixuetao'

adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java

@@ -452,7 +452,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
                 idSet.add("默认搜索条件");
             }
         }
-
+        vo.setUsid(UserUtils.getUserId());
         IPage<ReportVo> list = reportDao.page(page, vo, idSet);
 
         //设置权限

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
@@ -224,6 +224,8 @@
         <if test="Vo.usid != null and Vo.usid != ''">
             and t.createUserId=#{Vo.usid}
         </if>
+        GROUP BY
+        t.id
 
         ORDER BY updateDate desc
     </select>

adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java

@@ -99,7 +99,7 @@ public class UserEOController extends BaseController<UserEO> {
         }
 
         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("手机号不符合规则！");
             }
         }

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(",");
             // 插入组织关联表 暂时用不上,页面不维护组织机构

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -5,8 +5,8 @@
     <select id="list" parameterType="string" resultType="map">
         select * from(select t1.USID,t1.ACCOUNT,t1.USNAME,t1.CELLPHONE_NUMBER,t1.EMAIL,t3.NAME ROLENAME,t3.id ROLEID,
         date_format(t1.UPDATE_TIME,'%Y-%m-%d %H:%i:%S')CREATEDATE,
-        GROUP_CONCAT( DISTINCT org.ID ) as ORGID,
+        GROUP_CONCAT( DISTINCT org.ID ORDER BY org.ID DESC  ) as ORGID,
-        GROUP_CONCAT( DISTINCT org.LONG_NAME )as ORGNAME
+        GROUP_CONCAT( DISTINCT org.LONG_NAME ORDER BY org.ID DESC )as ORGNAME
         from
         (
         select * from  TS_USER

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TaskController.java

@@ -120,6 +120,7 @@ public class TaskController {
 							if(userById.getOrgEOList().size()>0){
 								map.put("orgName",userById.getOrgEOList().get(0).getLongName());
 							}
+							map.put("id",historicTaskInstance.get("id"));
 							map.put("name",historicTaskInstance.get("name"));
 							map.put("assignee", enUserName+"(" + consigner + " 委托)");
 							map.put("assigneeId", busProcessEntrust.getEnUserId());

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -1090,7 +1090,7 @@ public class TodoTaskController {
 
             }
             page.setList(list);
-            page.setCount(Long.valueOf(list.size()));
+            page.setCount(page1.getTotal());
             page.setPageSize(taskCommonQuery.getSize());
             page.setPageNo(taskCommonQuery.getCurrent());
         } else {
@@ -1265,7 +1265,7 @@ public class TodoTaskController {
 
                 }
                 page.setList(list);
-                page.setCount(Long.valueOf(list.size()));
+                page.setCount(page1.getTotal());
                 page.setPageSize(taskCommonQuery.getSize());
                 page.setPageNo(taskCommonQuery.getCurrent());
             } else {
@@ -1444,7 +1444,7 @@ public class TodoTaskController {
             System.out.println("11111浪费时间为:" + endTime1);
 
             page.setList(list);
-            page.setCount(Long.valueOf(list.size()));
+            page.setCount(page1.getTotal());
             page.setPageSize(taskCommonQuery.getSize());
             page.setPageNo(taskCommonQuery.getCurrent());
         } else {