1.审批流过滤字段

shiku_im/Podfile.lock

@@ -93,4 +93,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b24727c5036e6873182234452070d8185a3752ed
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.5.2

shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -4716,7 +4716,7 @@
 		7D2DA53E1DF55FAF00C2C4A8 /* icon_zan_nor222.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor222.png; sourceTree = "<group>"; };
 		7D2DA53F1DF55FAF00C2C4A8 /* icon_zan_nor333.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_zan_nor333.png; sourceTree = "<group>"; };
 		7D2EFB871E4C43A400962098 /* icon_dakalandian_nor3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_dakalandian_nor3.png; sourceTree = "<group>"; };
-		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = $RL2N4PN.png; sourceTree = "<group>"; };
+		7D2F45471DE8570300462CBD /* $RL2N4PN.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "$RL2N4PN.png"; sourceTree = "<group>"; };
 		7D2FBD6A1E683D5500A08F1F /* JLHONGDIANDetailVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JLHONGDIANDetailVC.h; path = myOA/JLHONGDIANDetailVC.h; sourceTree = "<group>"; };
 		7D2FBD6B1E683D5500A08F1F /* JLHONGDIANDetailVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JLHONGDIANDetailVC.m; path = myOA/JLHONGDIANDetailVC.m; sourceTree = "<group>"; };
 		7D2FBD6E1E6841A000A08F1F /* NumButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NumButton.h; path = myOA/NumButton.h; sourceTree = "<group>"; };
@@ -18693,7 +18693,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
+				"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
 				"${PODS_ROOT}/AliPay/AlipaySDK.bundle",
 				"${PODS_ROOT}/Bugtags/Bugtags.bundle",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
@@ -18712,7 +18712,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -20056,10 +20056,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = NO;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -20100,10 +20100,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DOUBANGO_HOME = "$(SRCROOT)/shiku_im/meeting/ios-ngn-stack/stacks";
-				DOUBANGO_LIBS = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = $DOUBANGO_HOME/thirdparties/iphone/lib/i386;
+				DOUBANGO_LIBS = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/i386";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -20138,10 +20138,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
+				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20165,18 +20165,18 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "shiku_im/shiku_im-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
-					$DOUBANGO_HOME/bindings/_common,
-					$DOUBANGO_HOME/tinySDP/include,
-					$DOUBANGO_HOME/tinyHTTP/include,
-					$DOUBANGO_HOME/tinySMS/include,
-					$DOUBANGO/HOME/tinyMSRP/include,
+					"$DOUBANGO_HOME/bindings/_common",
+					"$DOUBANGO_HOME/tinySDP/include",
+					"$DOUBANGO_HOME/tinyHTTP/include",
+					"$DOUBANGO_HOME/tinySMS/include",
+					"$DOUBANGO/HOME/tinyMSRP/include",
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					$DOUBANGO_HOME/tinyDAV/include,
-					$DOUBANGO_HOME/tinySAK/src,
-					$DOUBANGO_HOME/tinyNET/src,
-					$DOUBANGO_HOME/tinyMEDIA/include,
-					$DOUBANGO_HOME/tinySIP/include,
+					"$DOUBANGO_HOME/tinyDAV/include",
+					"$DOUBANGO_HOME/tinySAK/src",
+					"$DOUBANGO_HOME/tinyNET/src",
+					"$DOUBANGO_HOME/tinyMEDIA/include",
+					"$DOUBANGO_HOME/tinySIP/include",
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20207,48 +20207,8 @@
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay",
 					"$(PROJECT_DIR)/shiku_im/文件夹1/pay(支付宝)",
 				);
-				"LIBRARY_SEARCH_PATHS[arch=*]" = (
-					"$(PROJECT_DIR)/shiku_im/LibBPush",
-					"$(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib",
-					"$(PROJECT_DIR)/shiku_im/audioRecorder",
-					"$(PROJECT_DIR)/shiku_im/RSA/include",
-					"$(PROJECT_DIR)/shiku_im/Vendor/libidn",
-					"$(PROJECT_DIR)/shiku_im/RSA",
-					"$(PROJECT_DIR)/shiku_im/admob5.05",
-					"$(PROJECT_DIR)/shiku_im",
-					"$(PROJECT_DIR)",
-					"$(PROJECT_DIR)/shiku_im/controller/MapChoseLocation",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
-					"$(inherited)",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"$(inherited)",
-					$DOUBANGO_LIBS,
-					"$(SRCROOT)/shiku_im/Vendor/libidn",
-					"$(PROJECT_DIR)/shiku_im/RSA",
-					"$(PROJECT_DIR)/shiku_im/youMeng",
-					"$(PROJECT_DIR)/shiku_im/audioRecorder",
-					"$(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib",
-					"$(PROJECT_DIR)/shiku_im/admob5.05",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina",
-					"$(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\"",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/Masonry\"",
-					"$(inherited)",
-					"\"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"",
-				);
+				"LIBRARY_SEARCH_PATHS[arch=*]" = "$(PROJECT_DIR)/shiku_im/LibBPush $(PROJECT_DIR)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/audioRecorder $(PROJECT_DIR)/shiku_im/RSA/include $(PROJECT_DIR)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im $(PROJECT_DIR) $(PROJECT_DIR)/shiku_im/controller/MapChoseLocation $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(inherited) $DOUBANGO_LIBS $(SRCROOT)/shiku_im/Vendor/libidn $(PROJECT_DIR)/shiku_im/RSA $(PROJECT_DIR)/shiku_im/youMeng $(PROJECT_DIR)/shiku_im/audioRecorder $(SRCROOT)/shiku_im/amr_wav/VoiceConvert/lib $(PROJECT_DIR)/shiku_im/admob5.05 $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/QQ $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Sina $(PROJECT_DIR)/shiku_im/person/UMSocial/SocialLibraries/Wechat \"$PODS_CONFIGURATION_BUILD_DIR/MJRefresh\" \"$PODS_CONFIGURATION_BUILD_DIR/AFNetworking\" \"$PODS_CONFIGURATION_BUILD_DIR/SVProgressHUD\" \"$PODS_CONFIGURATION_BUILD_DIR/ReactiveObjC\" \"$PODS_CONFIGURATION_BUILD_DIR/Masonry\" $(inherited) \"$PODS_CONFIGURATION_BUILD_DIR/IQKeyboardManager\"";
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -20295,10 +20255,10 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D49MF83EK7;
 				DOUBANGO_LIBS = "";
-				"DOUBANGO_LIBS[arch=arm64]" = $DOUBANGO_HOME/thirdparties/iphone/lib/arm64;
-				"DOUBANGO_LIBS[arch=armv6]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv6;
-				"DOUBANGO_LIBS[arch=armv7]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7;
-				"DOUBANGO_LIBS[arch=armv7s]" = $DOUBANGO_HOME/thirdparties/iphone/lib/armv7s;
+				"DOUBANGO_LIBS[arch=arm64]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/arm64";
+				"DOUBANGO_LIBS[arch=armv6]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv6";
+				"DOUBANGO_LIBS[arch=armv7]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7";
+				"DOUBANGO_LIBS[arch=armv7s]" = "$DOUBANGO_HOME/thirdparties/iphone/lib/armv7s";
 				"DOUBANGO_LIBS[sdk=iphonesimulator*][arch=*]" = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -20324,16 +20284,16 @@
 				HEADER_SEARCH_PATHS = (
 					"$(PROJECT_DIR)/shiku_im/RSA/include",
 					/usr/include/libxml2,
-					$DOUBANGO_HOME/tinyDAV/include,
-					$DOUBANGO_HOME/tinySAK/src,
-					$DOUBANGO_HOME/tinyNET/src,
-					$DOUBANGO_HOME/tinyMEDIA/include,
-					$DOUBANGO/HOME/tinyMSRP/include,
-					$DOUBANGO_HOME/tinySIP/include,
-					$DOUBANGO_HOME/tinyHTTP/include,
-					$DOUBANGO_HOME/tinySMS/include,
-					$DOUBANGO_HOME/tinySDP/include,
-					$DOUBANGO_HOME/bindings/_common,
+					"$DOUBANGO_HOME/tinyDAV/include",
+					"$DOUBANGO_HOME/tinySAK/src",
+					"$DOUBANGO_HOME/tinyNET/src",
+					"$DOUBANGO_HOME/tinyMEDIA/include",
+					"$DOUBANGO/HOME/tinyMSRP/include",
+					"$DOUBANGO_HOME/tinySIP/include",
+					"$DOUBANGO_HOME/tinyHTTP/include",
+					"$DOUBANGO_HOME/tinySMS/include",
+					"$DOUBANGO_HOME/tinySDP/include",
+					"$DOUBANGO_HOME/bindings/_common",
 					"\"${PODS_ROOT}/Headers/Public/AFNetworking\"",
 					"$(inherited)",
 				);
@@ -20341,7 +20301,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					$DOUBANGO_LIBS,
+					"$DOUBANGO_LIBS",
 					"$(SRCROOT)/shiku_im/Vendor/libidn",
 					"$(PROJECT_DIR)/shiku_im/RSA",
 					"$(PROJECT_DIR)/shiku_im/youMeng",

shiku_im/shiku_im/AppDelegate.mm

@@ -6102,7 +6102,7 @@
         
         NSDictionary *errDic = @{@"reason":@"登录失败"};
         
-        [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
+//        [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
         
         [UASUserInfo shareManager].isAutoFrist = YES;
         
@@ -6129,7 +6129,7 @@
         
     }
     
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
+//    [[NSNotificationCenter defaultCenter] postNotificationName:@"UUAppUserLoginFailed" object:errDic];
   
     [UASUserInfo shareManager].isAutoFrist = YES;
         

shiku_im/shiku_im/Register&Login/loginVC.m

@@ -452,7 +452,7 @@
         
         [[NSNotificationCenter defaultCenter] postNotificationName:@"changeSelectTabbar" object:nil];
     }
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"plusCHangeMainHeight" object:nil];
+    
     _btn.userInteractionEnabled = YES;
 }
 
@@ -527,13 +527,24 @@
     [_wait hide];
 //    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
     //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
+    
+    [self loginUas];
+    
+    [self openAutoDaka];
+    
+    [self postBPushDataToServer:[BPush getChannelId]];
+    
     return show_error;
 }
 
 -(int) didServerConnectError:(JXConnection*)aDownload error:(NSError *)error{//error为空时，代表超时
     _btn.userInteractionEnabled = YES;
     [_wait hide];
-    [KPromptBox showKPromptBoxWithMassage:@"IM登录失败，请重新登录"];
+    [self loginUas];
+    
+    [self openAutoDaka];
+    
+    [self postBPushDataToServer:[BPush getChannelId]];
     //    [((AppDelegate*)[[UIApplication sharedApplication] delegate]) showMainUI];
     return show_error;
 }

shiku_im/shiku_im/controller/审批流详情/LYYApprovalDetailVC.m

@@ -2283,7 +2283,6 @@
                          @"true",@"result",
                          str,@"customDes", //审批要点
                          @"RECORDER",@"backTaskName",
-                         
                          @"1",@"_noc",
                          @"4311",@"holdtime",
                          @"0",@"_center",
@@ -2602,8 +2601,8 @@
                 
             }
             }
-            str = FORMAT(@"%@",model.fpd_id);
-            str1 = FORMAT(@"%@",model.IDString);
+            str = FORMAT(@"%@",model.fpd_id == nil?@"":model.fpd_id);
+            str1 = FORMAT(@"%@",model.IDString == nil?@"":model.IDString);
             
             if(model.inputStr.length > 0 && model.FB_field.length>0){
                 [parm setObject:model.inputStr forKey:model.FB_field];
@@ -2629,6 +2628,9 @@
     NSString *formS1 = [NSString dictionaryToJson:formStore];
     NSString *parm1 = FORMAT(@"[%@]",[parmArr componentsJoinedByString:@","]);
     
+        
+    parm1 = [parm1 stringByReplacingOccurrencesOfString:@"(null)" withString:@""];
+        
     NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:_FD_model.jp_caller,@"caller",
                          formS1,@"formStore",
                          parm1,@"param",
@@ -2644,9 +2646,6 @@
             
             [self PostAgree:sender];
             
-            
-            
-            
         }else{
             [HUD hide:YES];
             sender.selected = NO;