修改权限控制

total.xcodeproj/project.pbxproj

@@ -3123,8 +3123,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3140,7 +3140,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
+				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = 1;
@@ -3171,7 +3171,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomoe.total;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f96494cb-c220-43ce-8034-75e000c2193f";
+				PROVISIONING_PROFILE = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "total/total-Bridging-Header.h";
 				TARGETED_DEVICE_FAMILY = 1;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";

total/GTOApp/Business/BusinessViewController.m

@@ -217,10 +217,9 @@
         //工程
         NSArray *project = [NSArray arrayWithObjects:
                             @"500303,500300"
-                            ,@"500402,500400"
-                            ,@"500404,500402,500401,500403"
-                            ,@"500101",@"500102"
-                            ,@"500103", nil];
+                            ,@"500402,500401"
+                            ,@"500404,500403"
+                            ,@"500101,500102,500103", nil];
         //建仓、订油、配油、收油
         NSArray *order = [NSArray arrayWithObjects:
                           @"500802"
@@ -286,7 +285,8 @@
     for (int i=0; i<permission.count; i++) {
         if ([self permissionWithMaxNumber:permission[i]]) {
             cell.functionImageView.image = image;
-            cell.userInteractionEnabled = YES;break;
+            cell.userInteractionEnabled = YES;
+            break;
         }
         if (i == permission.count-1) {
             cell.functionImageView.image = [image rt_tintedImageWithColor:[UIColor grayColor] level:0.7];

total/GTOApp/Business/LicenceCheck/GTOLicenceCheckListViewController.m

@@ -106,7 +106,7 @@ static NSString *cellID = @"licenceListCell";
     }
     if (orderArr.count == 0) {
         QueryOrderNew *order = [QueryOrderNew new];
-        order.field = @"lastModify_time";
+        order.field = @"billnumber";
         order.direction = @"desc";
         [orderArr addObject:[order dictForCommit]];
     }
@@ -131,7 +131,7 @@ static NSString *cellID = @"licenceListCell";
     NSDictionary *dict = @{
         @"userUuid" : userUtil.f_user_uuid,
         @"billNumberLike" : billNumberObject,
-        @"state" : [NSNull null],
+        @"state" : GTO_LICENCE__STATE_ASKFORAPPROVE,
         @"repairUuid" : @"",
         @"repairNumberLike" : [NSNull null],// repairNumberObject,
         @"riskGrade" : riskGradeObject,

total/GTOApp/Business/Repair/GTOLiceneResultViewController.m

@@ -181,6 +181,8 @@ static NSString *headerProblemItemID = @"headerItem";
     
     //是已提交状态 && 有权限
     BOOL isSubmitted = [_d_licence.state isEqualToString:GTO_LICENCE__STATE_SUBMITTED] && [GTOCommonTools hasPermissionWithPermissionId:500405];
+    
+    //申请审批状态 && 有审批权
     BOOL isAskForApprove = [_d_licence.state isEqualToString:GTO_LICENCE__STATE_ASKFORAPPROVE] && approvePermission;
     
     if ([_d_licence.state isEqualToString:GTO_LICENCE_STATE_INITIAL] || [_d_licence.state isEqualToString:GTO_LICENCE_STATE_LOCAL]) {

total/Macro/GTOAppMacro.h

@@ -91,7 +91,7 @@
 //#define HTTP_REST_API_BASE_URL        @"http://139.196.39.77:8080/total-server/rest" 
 
 //开发环境
-#define HTTP_LOCAL_BASE_URL    @"http://139.196.195.30:8093"
+#define HTTP_LOCAL_BASE_URL    @"http://39.196.195.30:8093"
 #define HTTP_REST_API_BASE_URL        @"http://139.196.195.30:8093/total-server/rest"