[Bugfix] fixed approval all and use page permission

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ApprovalService.java

@@ -55,9 +55,7 @@ public class ApprovalService {
 
 
     public List<ApprovalTaskInfo> getTask() {
-        String userId = authUserHelper.getCurrentUserId();//TODO query user role from sesstion or db
-        String assignee = ("66933E7B-DA75-4B2E-B7D6-AB65DCA20D50".equalsIgnoreCase(userId)) ? "manager" : "accountant";
-        return periodApproveMapper.queryApprovalList(assignee.equalsIgnoreCase("manager") ? null : userId);
+        return periodApproveMapper.queryApprovalList();
     }
 
     private void startInstance(ApprovalDto dto, PeriodApprove pa) {

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodApproveMapper.java

@@ -128,11 +128,8 @@ public interface PeriodApproveMapper extends MyVatMapper {
             " INNER JOIN PROJECT p ON pa.PROJECT_ID = p.ID " +
             " JOIN \"USER\" u1 ON pa.CREATE_BY = u1.id " +
             " LEFT JOIN \"USER\" u2 ON pa.APPROVAL_BY = u2.id  " +
-            "<where> 1=1 " +
-            "   <if test=\"createId != null and createId !='' \">AND pa.CREATE_BY=#{createId}</if>" +
-            "</where>" +
             "</script>")
-   List<ApprovalTaskInfo> queryApprovalList(@Param("createId") String createId);
+   List<ApprovalTaskInfo> queryApprovalList();
 
     @Select("" +
             "SELECT  " +